Version 2.5.0.10

Global_Indexer/Changelog.txt

@@ -0,0 +1,12 @@
+# Changelog
+
+## 2.5.0
+
+* Replace Mail Library
+* Use DigitalData.Modules.Database for DB Access
+* Use DigitalData.Modules.License for License Management
+* Remove clsHotkey.vb
+* Remove ClassLogger.vb
+* Remove DDLLicenseManager
+* Fix jumping selection when refreshing profiles, indicies, etc
+* Fix crash when clicking add twice in admin

Global_Indexer/ClassConstants.vb

@@ -1,3 +1,7 @@
 Public Class ClassConstants
     Public Const VECTORSEPARATOR = "╚"
+
+    Public Const INDEX_TYPE_BOOLEAN = "BOOLEAN"
+    Public Const INDEX_TYPE_INTEGER = "INTEGER"
+    Public Const INDEX_TYPE_VARCHAR = "VARCHAR"
 End Class

Global_Indexer/ClassControls.vb

@@ -1,490 +0,0 @@
-Imports System.Data.SqlClient
-Imports Oracle.ManagedDataAccess.Client
-Imports DigitalData.Controls.LookupGrid
-
-
-Public Class ClassControls
-    Private Property Form As frmIndex
-    Private Property Panel As Panel
-
-    Public Class ControlMeta
-        Public Property IndexName As String
-        Public Property IndexType As String
-        Public Property MultipleValues As Boolean = False
-    End Class
-
-    Public Sub New(Panel As Panel, Form As frmIndex)
-        Me.Form = Form
-        Me.Panel = Panel
-    End Sub
-
-    Public Function AddCheckBox(indexname As String, y As Integer, vorbelegung As String, caption As String)
-        Try
-            Dim value As Boolean = False
-            Dim chk As New CheckBox
-            chk.Name = "chk" & indexname
-            chk.Size = New Size(100, 27)
-            chk.Location = New Point(11, y)
-            chk.Tag = New ControlMeta() With {
-                .IndexName = indexname,
-                .IndexType = "BOOLEAN"
-            }
-
-            If caption <> "" Then
-                chk.Text = caption
-                chk.Size = New Size(CInt(caption.Length * 15), 27)
-            End If
-
-            If Boolean.TryParse(vorbelegung, value) = False Then
-                If vorbelegung = "1" Or vorbelegung = "0" Then
-                    chk.Checked = CBool(vorbelegung)
-                Else
-                    chk.Checked = False
-                End If
-            Else
-                chk.Checked = value
-            End If
-
-            AddHandler chk.CheckedChanged, AddressOf Checkbox_CheckedChanged
-
-            Return chk
-        Catch ex As Exception
-            LOGGER.Info("Unhandled Exception in AddCheckBox: " & ex.Message)
-            LOGGER.Error(ex)
-            Return Nothing
-        End Try
-    End Function
-
-    Public Sub Checkbox_CheckedChanged(sender As CheckBox, e As EventArgs)
-        PrepareDependingControl(sender)
-    End Sub
-
-    'Public Function AddVorschlag_ComboBox(indexname As String, y As Integer, conid As Integer, sql_Vorschlag As String, Multiselect As Boolean, DataType As String, Optional Vorgabe As String = "", Optional AddNewValues As Boolean = False, Optional PreventDuplicateValues As Boolean = False, Optional SQLSuggestion As Boolean = False) As Control
-    '    Try
-    '        Dim oSql As String = sql_Vorschlag
-    '        Dim oConnectionString As String
-    '        Dim oControl As New DigitalData.Controls.LookupGrid.LookupControl3 With {
-    '            .MultiSelect = Multiselect,
-    '            .AllowAddNewValues = AddNewValues,
-    '            .PreventDuplicates = PreventDuplicateValues,
-    '            .Location = New Point(11, y),
-    '            .Size = New Size(300, 27),
-    '            .Name = "cmbMulti" & indexname,
-    '            .Tag = New ControlMeta() With {
-    '                .IndexName = indexname,
-    '                .IndexType = DataType
-    '            }
-    '        }
-    '        oControl.Properties.AppearanceFocused.BackColor = Color.FromArgb(255, 214, 49)
-
-    '        If Not String.IsNullOrEmpty(Vorgabe) Then
-    '            Dim oDefaultValues As New List(Of String)
-
-    '            If Vorgabe.Contains(",") Then
-    '                oDefaultValues = Vorgabe.
-    '                    Split(",").ToList().
-    '                    Select(Function(item) item.Trim()).
-    '                    ToList()
-    '            Else
-    '                oDefaultValues = Vorgabe.
-    '                    Split(ClassConstants.VECTORSEPARATOR).ToList().
-    '                    Select(Function(item) item.Trim()).
-    '                    ToList()
-    '            End If
-    '            oControl.SelectedValues = oDefaultValues
-    '        End If
-
-    '        AddHandler oControl.SelectedValuesChanged, AddressOf Lookup_SelectedValuesChanged
-
-    '        oConnectionString = ClassFormFunctions.GetConnectionString(conid)
-
-    '        If oConnectionString IsNot Nothing And oSql.Length > 0 And SQLSuggestion = True Then
-    '            LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))
-
-    '            If ClassPatterns.HasComplexPatterns(oSql) Then
-    '                LOGGER.Debug(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
-    '            Else
-    '                oSql = ClassPatterns.ReplaceInternalValues(oSql)
-    '                oSql = ClassPatterns.ReplaceUserValues(oSql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
-
-    '                Dim oDatatable = ClassDatabase.Return_Datatable_Combined(oSql, oConnectionString, False)
-    '                oControl.DataSource = oDatatable
-    '            End If
-    '        Else
-    '            LOGGER.Warn("Connection String for control [{0}] is empty!", oControl.Name)
-    '        End If
-
-    '        Return oControl
-    '    Catch ex As Exception
-    '        LOGGER.Info(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
-    '        LOGGER.Error(ex)
-    '        MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in AddVorschlag_ComboBox:")
-    '        Return Nothing
-    '    End Try
-    'End Function
-
-    Private Sub Lookup_SelectedValuesChanged(sender As LookupControl3, SelectedValues As List(Of String))
-        PrepareDependingControl(sender)
-    End Sub
-
-    Function AddCombobox(indexname As String, y As Integer)
-        Dim cmb As New ComboBox
-        cmb.Name = "cmb" & indexname
-        cmb.AutoSize = True
-        cmb.Size = New Size(300, 27)
-        cmb.Location = New Point(11, y)
-
-        cmb.Tag = New ControlMeta() With {
-            .IndexName = indexname
-        }
-
-
-        AddHandler cmb.SelectedIndexChanged, AddressOf OncmbSIndexChanged
-        AddHandler cmb.GotFocus, AddressOf OncmbGotFocus
-        AddHandler cmb.LostFocus, AddressOf OncmbLostFocus
-        AddHandler cmb.KeyDown, AddressOf OncmbKeyDown
-        Return cmb
-    End Function
-
-    Public Sub OncmbKeyDown(sender As System.Object, e As System.EventArgs)
-        Dim cmb As ComboBox = sender
-
-        ' Verhindert, dass Auswahlliste und Autocompleteliste übereinander liegen
-        If cmb.DroppedDown = True Then
-            cmb.DroppedDown = False
-        End If
-    End Sub
-
-    Public Sub OncmbGotFocus(sender As System.Object, e As System.EventArgs)
-        Dim cmb As ComboBox = sender
-        cmb.BackColor = Color.FromArgb(255, 214, 49)
-    End Sub
-
-    Public Sub OncmbLostFocus(sender As System.Object, e As System.EventArgs)
-        Dim cmb As ComboBox = sender
-        cmb.BackColor = Color.White
-    End Sub
-
-    Public Sub OncmbSIndexChanged(sender As System.Object, e As System.EventArgs)
-        If Form.FormLoaded = False Then
-            Exit Sub
-        End If
-
-        Dim cmb As ComboBox = sender
-        If cmb.SelectedIndex <> -1 Then
-            If cmb.Text.Length > 15 Then
-                Dim g As Graphics = cmb.CreateGraphics
-                cmb.Width = g.MeasureString(cmb.Text, cmb.Font).Width + 30
-                g.Dispose()
-            End If
-            Get_NextComboBoxResults(cmb)
-
-
-            SendKeys.Send("{TAB}")
-        End If
-    End Sub
-
-    Private Sub Get_NextComboBoxResults(cmb As ComboBox)
-        Try
-            Dim indexname = cmb.Name.Replace("cmb", "")
-            Dim sql = "SELECT GUID,NAME,SQL_RESULT FROM TBDD_INDEX_MAN where SUGGESTION = 1 AND SQL_RESULT like '%@" & indexname & "%' and DOK_ID = " & CURRENT_DOKART_ID & " ORDER BY SEQUENCE"
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
-            If Not IsNothing(DT) Then
-                If DT.Rows.Count > 0 Then
-                    Dim cmbname = "cmb" & DT.Rows(0).Item("NAME")
-                    Renew_ComboboxResults(DT.Rows(0).Item("GUID"), indexname, cmb.Text)
-                End If
-
-            End If
-        Catch ex As Exception
-            MsgBox("Error in Get_NextComboBoxResults:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Sub
-
-    Private Sub Renew_ComboboxResults(INDEX_GUID As Integer, SearchString As String, Resultvalue As String)
-        Try
-            Dim connectionString As String
-            Dim sqlCnn As SqlConnection
-            Dim sqlCmd As SqlCommand
-            Dim adapter As New SqlDataAdapter
-
-            Dim oracleConn As OracleConnection
-            Dim oracleCmd As OracleCommand
-            Dim oracleadapter As New OracleDataAdapter
-
-            Dim NewDataset As New DataSet
-            Dim i As Integer
-
-            Dim DT_INDEX As DataTable = ClassDatabase.Return_Datatable("select * FROM TBDD_INDEX_MAN WHERE GUID = " & INDEX_GUID, True)
-            If IsNothing(DT_INDEX) Then
-                Exit Sub
-            End If
-
-            Dim conid = DT_INDEX.Rows(0).Item("CONNECTION_ID")
-            Dim sql_result = DT_INDEX.Rows(0).Item("SQL_RESULT")
-            Dim NAME = DT_INDEX.Rows(0).Item("NAME")
-            If Not IsNothing(conid) And Not IsNothing(sql_result) And Not IsNothing(NAME) Then
-                For Each ctrl As Control In Me.Panel.Controls
-                    If ctrl.Name = "cmb" & NAME.ToString Then
-                        Dim cmb As ComboBox = ctrl
-                        Dim sql As String = sql_result.ToString.ToUpper.Replace("@" & SearchString.ToUpper, Resultvalue)
-
-                        connectionString = ClassFormFunctions.GetConnectionString(conid)
-                        If connectionString Is Nothing = False Then
-                            'SQL Befehl füllt die Auswahlliste
-
-                            If connectionString.Contains("Initial Catalog=") Then
-                                sqlCnn = New SqlConnection(connectionString)
-                                sqlCnn.Open()
-                                sqlCmd = New SqlCommand(sql, sqlCnn)
-                                adapter.SelectCommand = sqlCmd
-                                adapter.Fill(NewDataset)
-                            ElseIf connectionString.StartsWith("Data Source=") And connectionString.Contains("SERVICE_NAME") Then
-                                oracleConn = New OracleConnection(connectionString)
-                                ' Try
-                                oracleConn.Open()
-                                oracleCmd = New OracleCommand(sql, oracleConn)
-                                oracleadapter.SelectCommand = oracleCmd
-                                oracleadapter.Fill(NewDataset)
-                            End If
-                            If NewDataset.Tables(0).Rows.Count > 0 Then
-                                cmb.Items.Clear()
-                                'Die Standargrösse definieren
-                                Dim newWidth As Integer = 300
-                                For i = 0 To NewDataset.Tables(0).Rows.Count - 1
-                                    'MsgBox(NewDataset.Tables(0).Rows(i).Item(0))
-                                    cmb.Items.Add(NewDataset.Tables(0).Rows(i).Item(0))
-                                    Try
-                                        Dim text As String = NewDataset.Tables(0).Rows(i).Item(0)
-                                        If text.Length > 15 Then
-                                            Dim g As Graphics = cmb.CreateGraphics
-                                            If g.MeasureString(text, cmb.Font).Width + 30 > newWidth Then
-                                                newWidth = g.MeasureString(text, cmb.Font).Width + 30
-                                            End If
-                                            g.Dispose()
-                                        End If
-                                    Catch ex As Exception
-                                        MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Anpassung Breite ComboBox:")
-                                    End Try
-
-                                Next
-                                cmb.Size = New Size(newWidth, 27)
-                                cmb.AutoCompleteSource = AutoCompleteSource.ListItems
-                                cmb.AutoCompleteMode = AutoCompleteMode.Suggest
-                            End If
-                            If connectionString.Contains("Initial Catalog=") Then
-                                Try
-                                    adapter.Dispose()
-                                    sqlCmd.Dispose()
-                                    sqlCnn.Close()
-                                Catch ex As Exception
-
-                                End Try
-                            Else
-                                Try
-                                    oracleadapter.Dispose()
-                                    oracleCmd.Dispose()
-                                    oracleConn.Close()
-                                Catch ex As Exception
-
-                                End Try
-                            End If
-                        End If
-                    End If
-                Next
-            End If
-        Catch ex As Exception
-            LOGGER.Info(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
-            LOGGER.Error(ex)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Renew_ComboboxResults:")
-        End Try
-    End Sub
-
-    Public Function AddTextBox(indexname As String, y As Integer, text As String, DataType As String) As DevExpress.XtraEditors.TextEdit
-        Dim oEdit As New DevExpress.XtraEditors.TextEdit With {
-            .Name = "txt" & indexname,
-            .Size = New Size(260, 27),
-            .Location = New Point(11, y),
-             .Tag = New ControlMeta() With {
-                .IndexName = indexname,
-                .IndexType = DataType
-            }
-        }
-
-        Select Case DataType
-            Case "INTEGER"
-                oEdit.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric
-                oEdit.Properties.Mask.EditMask = "d"
-                Console.WriteLine()
-        End Select
-
-        If text IsNot Nothing Then
-            oEdit.Text = text
-            oEdit.SelectAll()
-        End If
-
-        AddHandler oEdit.GotFocus, AddressOf OnTextBoxFocus
-        AddHandler oEdit.LostFocus, AddressOf OnTextBoxLostFocus
-        AddHandler oEdit.KeyUp, AddressOf OnTextBoxKeyUp
-        AddHandler oEdit.TextChanged, AddressOf OnTextBoxTextChanged
-
-        Return oEdit
-    End Function
-
-    Public Sub OnTextBoxFocus(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
-        oTextbox.BackColor = Color.FromArgb(255, 214, 49)
-        oTextbox.SelectAll()
-    End Sub
-
-    Public Sub OnTextBoxTextChanged(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
-        Using oGraphics As Graphics = oTextbox.CreateGraphics()
-            oTextbox.Width = oGraphics.MeasureString(oTextbox.Text, oTextbox.Font).Width + 15
-        End Using
-    End Sub
-
-    Public Sub OnTextBoxLostFocus(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
-        oTextbox.BackColor = Color.White
-    End Sub
-
-    Public Sub OnTextBoxKeyUp(sender As System.Object, e As System.Windows.Forms.KeyEventArgs)
-        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
-
-        If oTextbox.Text = String.Empty Then
-            Exit Sub
-        End If
-
-        If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Enter Or e.KeyCode = Keys.Tab Then
-            PrepareDependingControl(oTextbox)
-        End If
-
-        If (e.KeyCode = Keys.Return) Then
-            SendKeys.Send("{TAB}")
-        End If
-    End Sub
-
-
-    Public Function AddDateTimePicker(indexname As String, y As Integer, DataType As String, Vorgabe As String) As DevExpress.XtraEditors.DateEdit
-        Dim oPicker As New DevExpress.XtraEditors.DateEdit With {
-            .Name = "dtp" & indexname,
-            .Size = New Size(260, 27),
-            .Location = New Point(11, y),
-            .Tag = New ControlMeta() With {
-                .IndexName = indexname,
-                .IndexType = DataType
-            }
-        }
-
-        If Vorgabe.ToUpper = "$NULL" Then
-            oPicker.EditValue = Nothing
-        ElseIf Vorgabe IsNot Nothing Then
-            oPicker.EditValue = Vorgabe
-        End If
-
-        oPicker.Properties.AppearanceFocused.BackColor = Color.FromArgb(255, 214, 49)
-
-        Return oPicker
-    End Function
-    Sub OndtpChanged()
-        'offen was hier zu tun ist
-    End Sub
-
-    Private Sub PrepareDependingControl(Control As Control)
-        If TypeOf Control Is Label Then
-            Exit Sub
-        End If
-
-        Try
-            Dim oMeta = DirectCast(Control.Tag, ClassControls.ControlMeta)
-            Dim oIndexName As String = oMeta.IndexName
-            Dim oSQL = $"SELECT * FROM TBDD_INDEX_MAN WHERE SQL_RESULT LIKE '%{oIndexName}%'"
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
-
-            If Not IsNothing(oDatatable) Then
-                LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name)
-
-                For Each oRow As DataRow In oDatatable.Rows
-                    Dim oControlName As String = NotNull(oRow.Item("NAME"), "")
-                    Dim oConnectionId As Integer = NotNull(oRow.Item("CONNECTION_ID"), -1)
-                    Dim oControlSql As String = NotNull(oRow.Item("SQL_RESULT"), "")
-
-                    If oConnectionId = -1 Or oControlSql = String.Empty Then
-                        LOGGER.Warn("Missing SQL Query or ConnectionId for Control [{0}]! Continuing.", oControlName)
-                        Continue For
-                    End If
-
-                    oControlSql = ClassPatterns.ReplaceUserValues(oControlSql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
-                    oControlSql = ClassPatterns.ReplaceInternalValues(oControlSql)
-                    oControlSql = ClassPatterns.ReplaceControlValues(oControlSql, Panel)
-
-                    LOGGER.Debug("SQL After Preparing: [{0}]", oControlSql)
-                    LOGGER.Debug("Setting new value for [{0}]", oControlName)
-                    SetDependingControlResult(oControlName, oControlSql, oConnectionId)
-                Next
-            End If
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
-    End Sub
-
-    Private Sub SetDependingControlResult(IndexName As String, SqlCommand As String, SqlConnectionId As Integer)
-        Try
-            If SqlCommand Is Nothing OrElse SqlCommand = String.Empty Then
-                LOGGER.Warn("New Value for Index [{0}] could not be set. Supplied SQL is empty.")
-                Exit Sub
-            End If
-
-            Dim oConnectionString = ClassFormFunctions.GetConnectionString(SqlConnectionId)
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString)
-            Dim oFoundControl As Control = Nothing
-
-            For Each oControl As Control In Panel.Controls
-                If TypeOf oControl Is Label Then
-                    Continue For
-                End If
-
-                Dim oMeta = DirectCast(oControl.Tag, ClassControls.ControlMeta)
-                Dim oIndex As String = oMeta.IndexName
-
-                If oIndex = IndexName Then
-                    oFoundControl = oControl
-                    Exit For
-                End If
-            Next
-
-            If oFoundControl Is Nothing Then
-                LOGGER.Warn("Depending Control for Index [{0}] not found!", IndexName)
-            End If
-
-            If oDatatable Is Nothing Then
-                LOGGER.Warn("Error in SQL Command: {0}", SqlCommand)
-            End If
-
-            Select Case oFoundControl.GetType.Name
-                Case GetType(DevExpress.XtraEditors.TextEdit).Name
-                    If oDatatable.Rows.Count > 0 Then
-                        Dim oFirstRow As DataRow = oDatatable.Rows.Item(0)
-
-                        If oFirstRow.ItemArray.Length > 0 Then
-                            Dim oValue = oFirstRow.Item(0).ToString()
-
-                            LOGGER.Debug("Setting Value for TextEdit [{0}]: [{1}]", oFoundControl.Name, oValue)
-                            DirectCast(oFoundControl, DevExpress.XtraEditors.TextEdit).Text = oValue
-                        End If
-                    End If
-                Case GetType(LookupControl3).Name
-                    LOGGER.Debug("Setting Value for LookupControl [{0}]: [{1}]", oFoundControl.Name, "DATATABLE")
-                    DirectCast(oFoundControl, LookupControl3).Properties.DataSource = oDatatable
-                Case GetType(ComboBox).Name
-                    LOGGER.Debug("Setting Value for Combobox [{0}]: [{1}]", oFoundControl.Name, "DATATABLE")
-                    DirectCast(oFoundControl, ComboBox).DataSource = oDatatable
-                Case Else
-                    LOGGER.Debug("Could not set depending control result for [{0}]", oFoundControl.GetType.Name)
-            End Select
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
-    End Sub
-End Class

Global_Indexer/ClassDatabase.vb

@@ -1,338 +0,0 @@
-Imports System.Data.SqlClient
-Imports Oracle.ManagedDataAccess.Client
-Public Class ClassDatabase
-    Private Const NETWORK_TIMEOUT As Integer = -1
-
-    Private Shared SQLSERVERConnectionString As String
-    Private Shared OracleConnectionString As String
-
-    Public Shared DatabaseConnectionTimeout As Boolean = False
-
-    Public Shared Function Init()
-        Try
-            SQLSERVERConnectionString = MyConnectionString
-            Dim SQLconnect As New SqlConnection
-            SQLconnect.ConnectionString = SQLSERVERConnectionString
-            SQLconnect.Open()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            LOGGER.Info("Unexpected error in Database-Init: " & ex.Message)
-            LOGGER.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Public Shared Function Get_ConnectionString(id As Integer)
-        Dim connectionString As String = ""
-        Try
-            'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id)
-            Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id)
-            If DTConnection.Rows.Count = 1 Then
-                Select Case DTConnection.Rows(0).Item("SQL_PROVIDER").ToString.ToUpper
-                    Case "MS-SQL"
-                        If DTConnection.Rows(0).Item("USERNAME") = "WINAUTH" Then
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
-                        Else
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        End If
-                        ' connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                    Case "Oracle"
-                        If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then
-                            connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                               DTConnection.Rows(0).Item("DATENBANK") & ")));User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Persist Security Info=True;User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";Unicode=True"
-                        End If
-                        'Case "ODBC"
-                        '    Dim conn As New OdbcConnection("dsn=" & DTConnection.Rows(0).Item("SERVER") & ";uid=" & DTConnection.Rows(0).Item("USERNAME") & ";pwd=" + DTConnection.Rows(0).Item("PASSWORD"))
-                        '    connectionString = conn.ConnectionString
-                    Case Else
-                        LOGGER.Info(" - ConnectionType nicht integriert")
-                        MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
-                End Select
-            Else
-                LOGGER.Info(" No entry for Connection-ID: " & id.ToString)
-            End If
-
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            LOGGER.Info(" - Error in bei Get ConnectionString - Fehler: " & vbNewLine & ex.Message)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Get ConnectionString:")
-        End Try
-        Return connectionString
-    End Function
-
-    Public Shared Function Return_Datatable_Combined(SqlCommand As String, ConnectionString As String, Optional userInput As Boolean = False)
-        If ConnectionString.Contains("Initial Catalog=") Then
-            Return Return_Datatable_CS(SqlCommand, ConnectionString, userInput)
-        Else
-            Return Oracle_Return_Datatable(SqlCommand, ConnectionString, userInput)
-        End If
-    End Function
-
-    Public Shared Function Return_Datatable(sql_command As String, Optional userInput As Boolean = False) As DataTable
-        Try
-            Dim SQLconnect As New SqlConnection
-            Dim SQLcommand As SqlCommand
-            SQLconnect.ConnectionString = SQLSERVERConnectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = sql_command
-            Dim adapter1 As SqlDataAdapter = New SqlDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-
-            ' Reset timeout counter when query was sucessful
-            DatabaseConnectionTimeout = False
-
-            Return dt
-        Catch ex As SqlException
-            Dim handled = CatchDatabaseTimeout(ex, sql_command)
-
-            If Not handled Then
-                If userInput = True Then
-                    MsgBox("Error in Return_Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-                End If
-                LOGGER.Error(ex)
-                LOGGER.Info("#SQL: " & sql_command)
-            End If
-
-            Return Nothing
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & sql_command)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Return_Datatable_CS(sql_command As String, ConString As String, Optional userInput As Boolean = False) As DataTable
-        Try
-            Dim SQLconnect As New SqlConnection
-            Dim SQLcommand As SqlCommand
-            SQLconnect.ConnectionString = ConString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = sql_command
-
-            Dim adapter1 As SqlDataAdapter = New SqlDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-
-            ' Reset timeout counter when query was sucessful
-            DatabaseConnectionTimeout = False
-
-            Return dt
-        Catch ex As SqlException
-            Dim handled = CatchDatabaseTimeout(ex, sql_command)
-
-            If Not handled Then
-                If userInput = True Then
-                    MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-                End If
-                LOGGER.Error(ex)
-                LOGGER.Info("#SQL: " & sql_command)
-            End If
-
-            Return Nothing
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & sql_command)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Execute_non_Query(sql_command As String, Optional userInput As Boolean = False) As Boolean
-        Try
-            Dim SQLconnect As New SqlConnection
-            Dim SQLcommand As SqlCommand
-            SQLconnect.ConnectionString = SQLSERVERConnectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = sql_command
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-
-            ' Reset timeout counter when query was sucessful
-            DatabaseConnectionTimeout = False
-
-            Return True
-        Catch ex As SqlException
-            Dim handled = CatchDatabaseTimeout(ex, sql_command)
-
-            If Not handled Then
-                If userInput = True Then
-                    MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-                End If
-                LOGGER.Error(ex)
-                LOGGER.Info("#SQL: " & sql_command)
-            End If
-
-            Return False
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & sql_command)
-
-            Return False
-        End Try
-    End Function
-    Public Shared Function Execute_non_Query_ConStr(ExecuteCMD As String, ConnString As String, Optional userInput As Boolean = False)
-        Try
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = ConnString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            LOGGER.Debug("Execute_non_Query_ConStr Created: " & ExecuteCMD)
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            If userInput = True Then
-                MsgBox("Error in Execute_non_Query_ConStr - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
-            End If
-            Clipboard.SetText("Error Execute_non_Query_ConStr: " & ex.Message & vbNewLine & "SQL: " & ExecuteCMD)
-            LOGGER.Info("Fehler bei Execute_non_Query_ConStr: " & ex.Message, True)
-            LOGGER.Info("#SQL: " & ExecuteCMD, False)
-
-            Return False
-        End Try
-    End Function
-    Public Shared Function Execute_Scalar(sql_command As String, ConString As String, Optional userInput As Boolean = False)
-        Dim result
-        Try
-            Dim SQLconnect As New SqlConnection
-            Dim SQLcommand As SqlCommand
-            SQLconnect.ConnectionString = ConString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = sql_command
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-
-            ' Reset timeout counter when query was sucessful
-            DatabaseConnectionTimeout = False
-
-            Return result
-        Catch ex As SqlException
-            Dim handled = CatchDatabaseTimeout(ex, sql_command)
-
-            If Not handled Then
-                If userInput = True Then
-                    MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-                End If
-                LOGGER.Error(ex)
-                LOGGER.Info("#SQL: " & sql_command)
-            End If
-
-            Return False
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Execute Scalar - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & sql_command)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
-        Dim result
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As New OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = cmdscalar
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return result
-        Catch ex As Exception
-            LOGGER.Info("Unexpected error in OracleExecute_Scalar: " & ex.Message)
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False)
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & ExecuteCMD)
-
-            Return False
-        End Try
-    End Function
-
-    Public Shared Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False)
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-
-            Dim adapter1 As OracleDataAdapter = New OracleDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-            Return dt
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Error(ex)
-            LOGGER.Info("#SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-
-    Public Shared Function CatchDatabaseTimeout(ex As SqlException, sql_command As String)
-        Dim FatalErrors As New List(Of Integer) From {-1, -2, 121}
-
-        If FatalErrors.Contains(ex.Number) Then
-            DatabaseConnectionTimeout = True
-
-            LOGGER.Info("Network timeout error in Return_Datatable: " & ex.Message)
-            LOGGER.Info("#SQL: " & sql_command)
-
-            Return True
-        Else
-            Return False
-        End If
-    End Function
-End Class

Global_Indexer/ClassDatatables.vb

@@ -8,7 +8,7 @@
                 (DOCTYPE_ID, GROUP_ID, ADDED_WHO)
                 VALUES ({ProfileId}, {GroupId}, '{Environment.UserName}')
             "
-            Return ClassDatabase.Execute_non_Query(oSQL, True)
+            Return DATABASE_ECM.ExecuteNonQuery(oSQL)
         Catch ex As Exception
             LOGGER.Error(ex)
             Return False
@@ -18,7 +18,7 @@
     Public Shared Function RemoveGroupFromProfile(GroupId As Integer, ProfileId As Integer) As Boolean
         Try
             Dim oSQL = $"DELETE FROM TBDD_USRGRP_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} AND GROUP_ID = {GroupId}"
-            Return ClassDatabase.Execute_non_Query(oSQL, True)
+            Return DATABASE_ECM.ExecuteNonQuery(oSQL)
         Catch ex As Exception
             LOGGER.Error(ex)
             Return False
@@ -36,7 +36,7 @@
 		            WHERE         DOCTYPE_ID = {ProfileId}
 	            )
             "
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             Return oDatatable
         Catch ex As Exception
@@ -56,7 +56,7 @@
 		            WHERE         DOCTYPE_ID = {ProfileId}
 	            )
             "
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             Return oDatatable
         Catch ex As Exception
@@ -75,7 +75,7 @@
                 (DOCTYPE_ID, USER_ID, ADDED_WHO)
                 VALUES ({ProfileId}, {UserId}, '{Environment.UserName}')
             "
-            Return ClassDatabase.Execute_non_Query(oSQL, True)
+            Return DATABASE_ECM.ExecuteNonQuery(oSQL)
         Catch ex As Exception
             LOGGER.Error(ex)
             Return False
@@ -85,7 +85,7 @@
     Public Shared Function RemoveUserFromProfile(UserId As Integer, ProfileId As Integer) As Boolean
         Try
             Dim oSQL = $"DELETE FROM TBDD_USER_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} AND USER_ID = {UserId}"
-            Return ClassDatabase.Execute_non_Query(oSQL, True)
+            Return DATABASE_ECM.ExecuteNonQuery(oSQL)
         Catch ex As Exception
             LOGGER.Error(ex)
             Return False
@@ -102,7 +102,7 @@
 		                WHERE         DOCTYPE_ID = {ProfileId}
                 )
             "
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             Return oDatatable
         Catch ex As Exception
@@ -122,7 +122,7 @@
 	                )
                 AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('GLOBIX', 1))
             "
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             Return oDatatable
         Catch ex As Exception

Global_Indexer/ClassEmail.vb

@@ -1,74 +0,0 @@
-Imports System.Net.Mail
-
-Public Class ClassEmail
-    Public Shared Function Send_Log_Mail(ByVal vBody As String, ByVal vBetreff As String, ByVal emailfrom As String, ByVal emailsmtp As String, ByVal emailuser As String, ByVal emailpw As String, ByVal email_empf As String, Optional test As Boolean = False, Optional Log As Boolean = False)
-        '#### E-MAIL NACHRICHT VERSENDEN
-        Try
-            Dim empfaenger As String()
-            If email_empf.Contains(";") Then
-                empfaenger = email_empf.Split(";")
-            Else
-                ReDim Preserve empfaenger(0)
-                empfaenger(0) = email_empf
-            End If
-            'Für jeden Empfänger eine Neue Mail erzeugen
-            For Each _mailempfaenger As String In empfaenger
-                ' Neue Nachricht erzeugen: 
-                Dim message As New MailMessage(emailfrom, _mailempfaenger, vBetreff & " - Domain: " & Environment.UserDomainName,
-                                               "<font face=""Arial"">" & vBody & "<br>>> Version: " & My.Application.Info.Version.ToString & "<br>>> Maschine: " & Environment.MachineName & "<br>" & "<br>>> Domain-Name: " & Environment.UserDomainName & "<br>" &
-                                               "<br>>> Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & " " &
-                                               My.Computer.Clock.LocalTime.ToLongTimeString & "</font>")
-                If test = False Then
-                    If Log = True Then
-                        ' create and add the attachment(s) */
-                        If ClassLogger.logDateiname.Contains("\\") Then
-                            ClassLogger.logDateiname = ClassLogger.logDateiname.Replace("\\", "\")
-                        End If
-                        If IO.File.Exists(ClassLogger.logDateiname) Then
-                            Dim Attachment As Attachment = New Attachment(ClassLogger.logDateiname)
-                            message.Attachments.Add(Attachment)
-                        End If
-                    End If
-                End If
-
-                With message
-                    .IsBodyHtml = True
-                    .Priority = MailPriority.High
-                End With
-
-                'Einen SMTP Client erzeugen und Anmeldungsinformationen hinterlegen
-                Dim emailClient As New SmtpClient(emailsmtp)
-                'Email mit Authentifizierung
-                Dim SMTPUserInfo As New System.Net.NetworkCredential(emailuser, emailpw)
-                emailClient.UseDefaultCredentials = False
-                emailClient.Credentials = SMTPUserInfo
-                emailClient.Port = 25
-
-                '*Send the message */
-                emailClient.Send(message)
-                If USER_LANGUAGE = "de-DE" Then
-                    If test = True Then
-                        MsgBox("Die Test-Email wurde erfolgreich versendet!", MsgBoxStyle.Information, "Erfolgsmeldung:")
-                    End If
-                    If Log = True Then
-                        MsgBox("Die Support-Email wurde erfolgreich versendet!", MsgBoxStyle.Information, "Erfolgsmeldung:")
-                    End If
-                Else
-                    If test = True Then
-                        MsgBox("Test-Email sucessfully sent!", MsgBoxStyle.Information, "Success:")
-                    End If
-                    If Log = True Then
-                        MsgBox("Support-Email sucessfully sent!", MsgBoxStyle.Information, "Success:")
-                    End If
-                End If
-                'LOGGER.Info(">> Support/Log Email erfolgreich an " & _mailempfaenger & " versendet!")
-            Next
-            Return True
-        Catch ex As Exception
-            LOGGER.Info("### Fehler im Mailversand: " & ex.Message)
-            LOGGER.Error(ex)
-            Return False
-        End Try
-    End Function
-
-End Class

Global_Indexer/ClassEmailHeaderExtractor.vb

@@ -1,105 +0,0 @@
-Imports Limilabs.Mail
-Imports Limilabs.Mail.MSG
-Imports System.Text.RegularExpressions
-
-Public Class ClassEmailHeaderExtractor
-    '''' <summary>
-    '''' Extrahiert die Headerinformationen aus einem msg Objekt mithilfe der MSG.NET Klasse
-    '''' </summary>
-    '''' <param name="msg">Eine Email vom Typ Msg.Message</param>
-    '''' <returns>Headerinformationen als String oder Nothing wenn ein Fehler aufgetreten ist.</returns>
-    'Public Shared Function getMessageHeaders(msg As Msg.Message)
-    '    Try
-    '        Dim headers = msg.TransportMessageHeaders.Replace(vbCrLf, " ")
-    '        Return headers
-    '    Catch ex As Exception
-    '        Return Nothing
-    '    End Try
-    'End Function
-
-    '''' <summary>
-    '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Absenderadresse.
-    '''' </summary>
-    '''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
-    '''' <param name="RegexList">Eine Liste von Regular Expressions</param>
-    '''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
-    '''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
-    'Public Shared Function extractFromAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
-    '    If IsNothing(messageHeaders) Then
-    '        Return Nothing
-    '    End If
-
-    '    For Each rx In RegexList
-    '        Dim match As Match = rx.Match(messageHeaders)
-    '        Dim email As String = match.Groups(RegexGroup).Value
-
-    '        If Not String.IsNullOrWhiteSpace(email) Then
-    '            Return email
-    '        End If
-    '    Next
-
-    '    Return Nothing
-    'End Function
-    'Public Shared Function extractFromHeader(messageHeaders As String, Regex As String)
-    '    Try
-    '        Dim result = Nothing
-    '        Dim i As Integer = 0
-    '        If IsNothing(messageHeaders) Then
-    '            Return Nothing
-    '        End If
-    '        ' einen Regulären Ausdruck laden
-    '        Dim strRegex As String = Regex
-    '        Dim myRegex As New Regex(strRegex, RegexOptions.IgnorePatternWhitespace Or RegexOptions.IgnoreCase)
-    '        Dim strTargetString As String = messageHeaders.Trim
-    '        ' die Vorkommen im String auslesen
-    '        For Each myMatch As Match In myRegex.Matches(strTargetString)
-    '            If myMatch.Success Then
-    '                LOGGER.Debug("Match success. Matched Value: [{0}]", myMatch.Value)
-
-    '                If myMatch.Value <> "" Then
-    '                    If i = 0 Then
-    '                        result = myMatch.Value.ToString
-    '                    Else
-    '                        result = result & ";" & myMatch.Value.ToString
-    '                    End If
-    '                    i += 1
-    '                End If
-    '            Else
-    '                LOGGER.Debug("Match failed!")
-    '            End If
-    '        Next
-
-    '        LOGGER.Debug("Extracted value: [{0}]", result)
-
-    '        Return result
-    '    Catch ex As Exception
-    '        LOGGER.Error(ex)
-    '        MsgBox("Unexpected Error in extractFromHeader: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-    '        Return Nothing
-    '    End Try
-    'End Function
-
-    '''' <summary>
-    '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Empfängeradresse.
-    '''' </summary>
-    '''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
-    '''' <param name="RegexList">Eine Liste von Regular Expressions</param>
-    '''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
-    '''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
-    'Public Shared Function extractToAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
-    '    If IsNothing(messageHeaders) Then
-    '        Return Nothing
-    '    End If
-
-    '    For Each rx In RegexList
-    '        Dim match As Match = rx.Match(messageHeaders)
-    '        Dim email As String = match.Groups(RegexGroup).Value
-
-    '        If Not String.IsNullOrWhiteSpace(email) Then
-    '            Return email
-    '        End If
-    '    Next
-
-    '    Return Nothing
-    'End Function
-End Class

Global_Indexer/ClassFileDrop.vb

@@ -1,294 +0,0 @@
-Imports System.IO
-Imports Microsoft.Office.Interop
-
-
-
-Public Class ClassFileDrop
-    Public Shared files_dropped As String()
-
-    ' Tobit David Drag Drop: https://www.david-forum.de/thread/12671-drag-and-drop-von-faxen-und-mails-in-net-anwendung/
-    'Private Declare Function DVEmlFromMailItem Lib "DvApi32" (ByVal oMailItem As MailItem, ByVal strFileName As String) As Long
-
-    Public Shared Function Drop_File(e As DragEventArgs)
-        Try
-            LOGGER.Debug("Available Drop Formats:")
-
-            For Each oFormat As String In e.Data.GetFormats()
-                LOGGER.Debug(oFormat)
-            Next
-
-            LOGGER.Info("Drop_File")
-            files_dropped = Nothing
-            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-                Dim MyFiles() As String
-                Dim i As Integer
-                ' Assign the files to an array. 
-                MyFiles = e.Data.GetData(DataFormats.FileDrop)
-                ' Loop through the array and add the files to the list. 
-                For i = 0 To MyFiles.Length - 1
-                    LOGGER.Info("Simple FileDrop - File: " & MyFiles(i))
-                    ReDim Preserve files_dropped(i)
-                    files_dropped(i) = "|DROPFROMFSYSTEM|" & MyFiles(i)
-                    ' ListBox1.Items.Add(MyFiles(i))
-                Next
-                Return True
-            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
-                '// the first step here is to get the stbFileName
-                '// of the attachment and
-                '// build a full-path name so we can store it
-                '// in the temporary folder
-                '//
-                '// set up to obtain the aryFileGroupDescriptor
-                '// and extract the file name                
-                Dim stmInput As IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), IO.Stream)
-                Dim aryFileGroupDescriptor(512) As Byte ' = new byte[512]
-                stmInput.Read(aryFileGroupDescriptor, 0, 512)
-                '// used to build the stbFileName from the aryFileGroupDescriptor block
-                Dim stbFileName As System.Text.StringBuilder = New System.Text.StringBuilder("")
-                '// this trick gets the stbFileName of the passed attached file
-                Dim intCnt As Integer = 76
-                Do While aryFileGroupDescriptor(intCnt) <> 0
-                    stbFileName.Append(Convert.ToChar(aryFileGroupDescriptor(intCnt), System.Globalization.CultureInfo.CreateSpecificCulture("de-DE")))
-                    intCnt += 1
-                Loop
-                stmInput.Close()
-                'Sonderzeichen entfernen
-                Dim Tempfilename = DigitalData.Modules.Language.Utils.RemoveInvalidCharacters(stbFileName.ToString)
-                Dim anhaenge = e.Data.GetDataPresent("FileContents")
-                'Dim path As String = "C:\VBProjekte\Dateien"
-                '// put the zip file into the temp directory
-                Dim strOutFile As String = Path.GetTempPath() & Tempfilename
-                '// create the full-path name
-                '//
-                '// Second step:  we have the file name. 
-                '// Now we need to get the actual raw
-                '// data for the attached file and copy it to disk so we work on it.
-                '//
-                '// get the actual raw file into memory
-                Dim msInput As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) 'This returns nothing for an Email
-                If msInput Is Nothing = False Then
-                    '// allocate enough bytes to hold the raw date
-                    Dim aryFileBytes(CType(msInput.Length, Int32)) As Byte
-                    '// set starting position at first byte and read in the raw data
-                    msInput.Position = 0
-                    msInput.Read(aryFileBytes, 0, CType(msInput.Length, Int32))
-                    '// create a file and save the raw zip file to it
-                    Dim fsOutput As IO.FileStream = New IO.FileStream(strOutFile, IO.FileMode.Create) ';
-                    fsOutput.Write(aryFileBytes, 0, aryFileBytes.Length)
-                    fsOutput.Close() ' // close the file
-                    Dim resultVersion = ClassFilehandle.Versionierung_Datei(strOutFile)
-                    If resultVersion <> "" Then
-                        strOutFile = resultVersion
-                    End If
-                    Dim finTemp As IO.FileInfo = New IO.FileInfo(strOutFile)
-                    '// always good to make sure we actually created the file
-                    If (finTemp.Exists = True) Then
-                        ReDim Preserve files_dropped(0)
-                        files_dropped(0) = "|OUTLOOK_ATTACHMENT|" & strOutFile
-                        LOGGER.Info("Drop an Attachment - File: " & strOutFile)
-                        Return True
-                    Else
-                        LOGGER.Info("Attachment File from Outlook could not be created")
-                    End If
-                End If
-            End If
-            If e.Data.GetDataPresent("FileGroupDescriptor") Then
-                Dim oApp As Outlook.Application
-                Try
-                    oApp = New Outlook.Application()
-                Catch ex As Exception
-                    LOGGER.Error(ex)
-                    MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
-                    Return False
-                End Try
-
-                LOGGER.Info(" Drop of msg")
-                'supports a drop of a Outlook message 
-                Dim myobj As Outlook.MailItem
-                For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
-                    myobj = oApp.ActiveExplorer.Selection.Item(i)
-                    Dim subj As String = myobj.Subject
-                    If subj = "" Then
-                        subj = "NO_SUBJECT"
-                    End If
-                    If subj.Contains("\") Then
-                        subj = subj.Replace("\", "-")
-                    End If
-                    If subj.Contains("/") Then
-                        subj = subj.Replace("/", "-")
-                    End If
-
-                    'Sonderzeichen entfernen
-                    subj = DigitalData.Modules.Language.Utils.RemoveInvalidCharacters(subj)
-                    'hardcode a destination path for testing
-                    Dim oFilename As String = IO.Path.Combine(Path.GetTempPath, subj + ".msg")
-
-                    oFilename = oFilename.Replace("?", "")
-                    oFilename = oFilename.Replace("!", "")
-                    oFilename = oFilename.Replace("%", "")
-                    oFilename = oFilename.Replace("$", "")
-                    LOGGER.Info("Drop of msg - File:" & oFilename)
-                    Try
-                        myobj.SaveAs(oFilename)
-                    Catch ex As Exception
-                        LOGGER.Error(ex)
-                        MsgBox("Die Email konnte aufgrund einer Sicherheitseinstellung im Outlook nicht abgelegt werden! " &
-                                   "Bitte wenden Sie sich an Ihren Administrator, " &
-                                   "um den programmatischen Zugriff auf Outlook zuzulassen. " &
-                                   "Weitere Informationen finden Sie im Log.", MsgBoxStyle.Critical, "Global Indexer")
-                    End Try
-
-                    ReDim Preserve files_dropped(i)
-                    files_dropped(i) = "|OUTLOOK_MESSAGE|" & oFilename
-                Next
-
-
-                Return True
-                'Drop eines Outlook Attachments
-            End If
-
-        Catch ex As Exception
-            MsgBox("Error in Drop-File" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            Return False
-        End Try
-
-    End Function
-
-
-    'Private Sub DragDrop_HandleTobit(e As DragEventArgs)
-    '    If e.Data.GetDataPresent("#TobitMsgData") Then
-    '        Dim Quellpfad As String = ""
-    '        Dim Dateinamen As String()
-    '        'Quellpfad zu den David Dateien auslesen            
-    '        Using ms As MemoryStream = e.Data.GetData("#TobitMsgData")
-    '            Dim bytes As Byte() = ms.ToArray()
-    '            Dim n As Integer = 0
-    '            Dim c As Char
-    '            Do While True
-    '                c = Convert.ToChar(bytes(n))
-    '                If bytes(n) <> 0 Then
-    '                    Quellpfad &= c
-    '                    n += 1
-    '                Else
-    '                    Exit Do
-    '                End If
-    '            Loop
-    '        End Using
-    '        'Dateinamen der gedroppten Emails auslesen  
-    '        Using ms As MemoryStream = e.Data.GetData("FileGroupDescriptor")
-    '            'Header sind 4B           
-    '            'Jeder Datensatz ist 332B          
-    '            'Bei Index 72 des Datensatzes beginnt das "Dateiname.eml"     
-    '            Dim bytes As Byte() = ms.ToArray()
-    '            ReDim Dateinamen(Int(bytes.Count / 332) - 1)
-    '            ' Array mit so vielen Elementen wie Datensätze im FileGroupDescriptor sind     
-    '            Dim AnzahlMails As Integer = bytes(0)
-    '            Dim Dateiname As String
-    '            Dim n As Integer
-    '            For i = 0 To AnzahlMails - 1
-    '                Dateiname = ""
-    '                n = 0
-    '                Do While True
-    '                    'Solange die Bytes auslesen, bis man einen vbNullChar liest        
-    '                    If bytes(i * 332 + 4 + 72 + n) <> 0 Then
-    '                        Dateiname = Dateiname & Convert.ToChar(bytes(i * 332 + 4 + 72 + n))
-
-    '                        n += 1
-    '                    Else
-    '                        Exit Do
-    '                    End If
-    '                Loop
-    '                Dateinamen(i) = Dateiname
-    '            Next
-    '        End Using
-    '        Using EntryDataEx As MemoryStream = e.Data.GetData("#TobitEntryDataEx")
-    '            Dim bytes As Byte() = EntryDataEx.ToArray()
-    '            'Die Größe des Headers steht im ersten Byte      
-    '            Dim HeadExSize As Integer = bytes(0)
-    '            'Die Anzahl der Datensätze steht im 8. - 11. Byte      
-    '            Dim nCountEntries As Integer = BitConverter.ToInt32(bytes, 8)
-    '            Dim nPositions(nCountEntries - 1) As Integer
-    '            For i = 0 To nCountEntries - 1
-    '                'Datensätze in der #TobitEntryDataEx sind 269 Byte groß.        
-    '                'In den ersten 4 Bytes steht die QID aus der archive.dat            
-    '                nPositions(i) = BitConverter.ToInt32(bytes, HeadExSize + i * 269)
-    '            Next
-
-    '            Using fs As New FileStream(Quellpfad & "\archive.dat", FileMode.Open, FileAccess.Read)
-
-    '                'archive.dat als MemoryStream kopieren           
-    '                Using ms As New MemoryStream
-    '                    fs.CopyTo(ms)
-    '                    'MemoryStream in ein Byte-Array konvertieren     
-    '                    Dim archiveBytes As Byte() = ms.ToArray()
-    '                    'Datensätze in der archive.dat sind 430 Byte groß         
-    '                    For i = 16 To archiveBytes.Length - 1 Step 430
-
-    '                        'Das 17.-20. Byte ist die QID die wir suchen            
-    '                        Dim QID As Integer = BitConverter.ToInt32(archiveBytes, i)
-    '                        'Wenn die QID übereinstimmt mit einer der David-Mails, dann lies den Dateinamen im Archiv aus      
-    '                        If nPositions.Contains(QID) Then
-
-    '                            'Der Index der QID (0, ..., nCountEntries - 1)          
-    '                            Dim nPosIndex As Integer = -1
-    '                            For j = 0 To nPositions.Length - 1
-    '                                If QID = nPositions(j) Then
-    '                                    nPosIndex = j
-    '                                    Exit For
-    '                                End If
-    '                            Next
-    '                            'Alle Bytes ab dem 17. bis zum Ende des Datensatzes aus der archive.bat auslesen und als String konvertieren                      
-    '                            Dim byteString As String = ""
-    '                            For j = 0 To 429 - 17
-    '                                byteString &= Convert.ToChar(archiveBytes(i + j))
-    '                            Next
-    '                            'Index der Id herausfinden (Index des Quellpfads im byteString + Länge des Quellpfads + 1 "\")         
-    '                            Dim IdIndex As Integer = byteString.IndexOf(Quellpfad, StringComparison.OrdinalIgnoreCase) + Quellpfad.Length + 1
-    '                            'Die Id sind dann die 8 Zeichen ab dem IdIndex              
-    '                            Dim Id As String = byteString.Substring(IdIndex, 8)
-    '                            'EML speichern                  
-    '                            DavidEmlSpeichern(Quellpfad, Dateinamen(nPosIndex), QID, Id)
-    '                        End If
-    '                    Next
-    '                End Using
-    '            End Using
-    '        End Using
-    '    End If
-    'End Sub
-
-    'Private Sub DavidEmlSpeichern(ArchivePfad As String, Dateiname As String, ID As String, FaxID As String)
-    '    Dim oApp As DavidAPIClass
-    '    Dim oAcc As Account
-    '    Dim oArchive As Archive
-    '    Dim oMessageItems As MessageItems
-    '    Dim oMailItem As MailItem
-    '    oApp = New DavidAPIClass()
-    '    oApp.LoginOptions = DvLoginOptions.DvLoginForceAsyncDuplicate
-    '    oAcc = oApp.Logon("DavidServer", "", "", "", "", "NOAUTH")
-    '    oArchive = oAcc.ArchiveFromID(ArchivePfad)
-    '    If FaxID.First() = "M" Then
-    '        'Faxe beginnen mit M
-    '        'Bei Faxen kann man einfach die .001 Datei kopieren und als TIF speichern
-    '        File.Copy(ArchivePfad & "\" & FaxID & ".001", "C:\Temp\" & Dateiname, True)
-    '        ListeAktualisieren()
-    '    ElseIf FaxID.First() = "I" Then
-    '        'Emails beginnen mit I
-    '        'Bei Emails muss man die DVEmlFromMailItem mit dem richtigen oMailItem aufrufen
-    '        oMessageItems = oArchive.MailItems
-    '        For Each oMailItem In oMessageItems
-    '            If oMailItem._ID = ID Then
-    '                Dim fileName As String = Space(260)
-    '                If DVEmlFromMailItem(oMailItem, fileName) <> 0 Then
-    '                    fileName = Trim(fileName)
-    '                    fileName = fileName.Substring(0, fileName.Length - 1)
-    '                    File.Copy(fileName, "C:\Temp\" & Dateiname, True)
-    '                    ListeAktualisieren()
-    '                End If
-    '                Exit For
-    '            End If
-    '        Next
-    '    End If
-    'End Sub
-
-
-End Class

Global_Indexer/ClassFileHandler.vb

@@ -1,16 +1,95 @@
 Imports System.IO
 Imports System.Guid
 Imports System.Text.RegularExpressions
-Imports DevExpress.XtraEditors
-Imports DigitalData.Modules.Language
 Imports Limilabs.Mail
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
 
-Public Class ClassFilehandle
-    Public Shared Function Decide_FileHandle(pFilename As String, pHandletype As String)
+Public Class ClassFileHandler
+    Inherits BaseClass
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Public Property TempFiles As New List(Of String)
+
+    Private Function GetTempPath(pSourceFilePath As String, pNewFileName As String, pSubfolder As String) As String
         Try
-            If pFilename.ToUpper.EndsWith(".MSG") Or pFilename.ToUpper.EndsWith(".EML") Then
+            Dim oTempDirectory = Path.GetTempPath()
+            Dim oTempSubDirectory As String = Path.Combine(oTempDirectory, pSubfolder)
+
+            ' Try to create a subdirectory for all temp files so it will be easier to clean up 
+            ' these files by just deleting the whole fucking folder. 🤬
+            If Not Directory.Exists(oTempSubDirectory) Then
+                Try
+                    Directory.CreateDirectory(oTempSubDirectory)
+                Catch ex As Exception
+                    Logger.Error(ex)
+                    ' We could not create a subfolder
+                    ' Set the final directory to the default temp
+                    oTempSubDirectory = oTempDirectory
+                End Try
+            End If
+
+            ' Copy the file to the new location
+            Dim oNewPath = Path.Combine(oTempSubDirectory, pNewFileName)
+            File.Copy(pSourceFilePath, oNewPath)
+
+            Return oNewPath
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    Public Function Decide_FileHandle(pFilepath As String, pHandletype As String) As Boolean
+        Try
+            ''TODO: Before doing anything, clean the filename
+            'Dim oFilename = IO.Path.GetFileName(pFilepath)
+            'Dim oCleanFileName = Utils.RemoveInvalidCharacters(oFilename)
+            'Dim oTempDirectory = IO.Path.GetTempPath()
+            'Dim oTempFilePath = IO.Path.Combine(oTempDirectory, oCleanFileName)
+
+            'Try
+            '    TEMP_FILES.Add(oTempFilePath)
+            '    LOGGER.Debug("Copying file")
+            '    LOGGER.Debug(pFilepath)
+            '    LOGGER.Debug(oTempFilePath)
+            '    IO.File.Copy(pFilepath, oTempFilePath, True)
+            'Catch ex As Exception
+            '    LOGGER.Error(ex)
+            '    Throw ex
+            'End Try
+
+            Dim oTempFilePath = pFilepath
+
+            Dim oInboxRegex As New Regex("\.INBOX\d+$")
+
+            If oInboxRegex.IsMatch(oTempFilePath) Then
+                Logger.Info("Renaming INBOX file to EML")
+
+                Try
+                    Dim oInfo As New FileInfo(oTempFilePath)
+                    Logger.Info("Old Name: {0}", oInfo.Name)
+                    Dim oNewName = $"{oInfo.Name}.eml"
+                    Logger.Info("New Name: {0}", oNewName)
+                    Dim oTempDirectory = IO.Path.GetTempPath()
+                    Dim oNewPath = IO.Path.Combine(oTempDirectory, oNewName)
+
+                    IO.File.Copy(oInfo.FullName, oNewPath)
+
+                    'TEMP_FILES.Add(oNewPath)
+                    TempFiles.Add(oNewPath)
+
+                    oTempFilePath = oNewPath
+                Catch ex As Exception
+                    Logger.Error(ex)
+                End Try
+            End If
+
+            If oTempFilePath.ToUpper.EndsWith(".MSG") Or oTempFilePath.ToUpper.EndsWith(".EML") Then
                 CURRENT_MESSAGEID = ""
-                Dim oMail As IMail = EMAIL.Load_Email(pFilename)
+                Dim oMail As IMail = EMAIL.Load_Email(oTempFilePath)
                 If oMail.Attachments.Count > 0 Then
                     Dim oTitle As String
                     Dim oMessage As String
@@ -28,14 +107,15 @@ Public Class ClassFilehandle
                     ' https://stackoverflow.com/questions/1220882/keep-messagebox-show-on-top-of-other-application-using-c-sharp
                     oResult = MessageBox.Show(oMessage, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
 
+
                     If oResult = MsgBoxResult.Yes Then
                         Dim oIsFolderWatch = pHandletype.StartsWith("|FW")
-                        Return Save_EmailAndAttachmentsToDisk(pFilename, oIsFolderWatch)
+                        Return Save_EmailAndAttachmentsToDisk(oTempFilePath, oIsFolderWatch)
                     End If
                 End If
             End If
 
-            If pFilename.ToUpper.EndsWith(".LNK") Then
+            If oTempFilePath.ToUpper.EndsWith(".LNK") Then
                 If USER_LANGUAGE = "de-DE" Then
                     MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "Global Indexer")
                 Else
@@ -44,14 +124,14 @@ Public Class ClassFilehandle
                 Return False
             End If
 
-            Return Insert_GI_File(pFilename, pHandletype)
+            Return Insert_GI_File(oTempFilePath, pHandletype)
         Catch ex As Exception
             MsgBox("Unexpected Error in Decide_FileHandle: " & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
     End Function
 
-    Private Shared Function Save_EmailAndAttachmentsToDisk(pEmailFilePath As String, Optional pFolderWatch As Boolean = False) As Boolean
+    Private Function Save_EmailAndAttachmentsToDisk(pEmailFilePath As String, Optional pFolderWatch As Boolean = False) As Boolean
         Try
             Dim oMessageOnlyMarker As String = "|MSGONLY|"
             Dim oExtractedAttachmentMarker As String = "|ATTMNTEXTRACTED|"
@@ -61,33 +141,37 @@ Public Class ClassFilehandle
             End If
             Dim oSuccess As Boolean = False
 
-            LOGGER.Info("Converting file to Eml if needed: [{0}]", pEmailFilePath)
+            Logger.Info("Converting file to Eml if needed: [{0}]", pEmailFilePath)
             Dim oEmail As IMail = EMAIL.Load_Email(pEmailFilePath)
 
             If oEmail.MessageID IsNot Nothing Then
                 CURRENT_MESSAGEID = oEmail.MessageID
             Else
-                LOGGER.Info("Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!")
+                Logger.Info("Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!")
                 CURRENT_MESSAGEID = NewGuid.ToString()
             End If
 
             Dim oEmailFilePathWithoutAttachments = EMAIL.Remove_AttachmentsFromEmail(pEmailFilePath, "_excl_attachments")
-            TEMP_FILES.Add(oEmailFilePathWithoutAttachments)
+
+            TempFiles.Add(oEmailFilePathWithoutAttachments)
+            'TEMP_FILES.Add(oEmailFilePathWithoutAttachments)
 
             If Insert_GI_File(oEmailFilePathWithoutAttachments, oMessageOnlyMarker) = True Then
                 oSuccess = True
 
                 Dim oAttachments As List(Of String) = EMAIL.Save_AttachmentsToDisk(pEmailFilePath)
 
-                LOGGER.Debug("Saved [{0}] attachments to disk.", oAttachments.Count)
+                Logger.Debug("Saved [{0}] attachments to disk.", oAttachments.Count)
 
                 For Each oAttachment In oAttachments
-                    TEMP_FILES.Add(oAttachment)
-                    LOGGER.Debug("Saved attachment [{0}].", oAttachment)
+                    'TEMP_FILES.Add(oAttachment)
+                    TempFiles.Add(oAttachment)
+
+                    Logger.Debug("Saved attachment [{0}].", oAttachment)
                     oSuccess = Insert_GI_File(oAttachment, oExtractedAttachmentMarker)
 
                     If oSuccess = False Then
-                        LOGGER.Warn("Saving attachment to disk failed: [{0}]", oAttachment)
+                        Logger.Warn("Saving attachment to disk failed: [{0}]", oAttachment)
                         Exit For
                     End If
                 Next
@@ -95,8 +179,8 @@ Public Class ClassFilehandle
 
             Return oSuccess
         Catch ex As Exception
-            LOGGER.Warn("Saving email to disk failed (Email_Decay)")
-            LOGGER.Error(ex)
+            Logger.Warn("Saving email to disk failed (Email_Decay)")
+            Logger.Error(ex)
 
             Return False
         End Try
@@ -188,7 +272,7 @@ Public Class ClassFilehandle
     '    End Try
     'End Function
 
-    Private Shared Function Insert_GI_File(filename As String, handleType As String)
+    Private Function Insert_GI_File(filename As String, handleType As String)
         Try
             filename = filename.Replace("'", "''")
 
@@ -204,13 +288,13 @@ Public Class ClassFilehandle
 
             Dim filename_only As String = Path.GetFileName(filename)
             Dim ins As String = $"INSERT INTO TBGI_FILES_USER (FILENAME2WORK, USER@WORK, HANDLE_TYPE, FILENAME_ONLY, FILE_HASH) VALUES ('{filename}','{Environment.UserName}','{handleType}','{filename_only}', '{oHash}')"
-            Return ClassDatabase.Execute_non_Query(ins, True)
+            Return DATABASE_ECM.ExecuteNonQuery(ins)
 
         Catch ex As Exception
             Return False
         End Try
     End Function
-    Public Shared Function IsFileInUse(ByVal fullFilePath As String) As Boolean
+    Public Function IsFileInUse(ByVal fullFilePath As String) As Boolean
         ' Gibt zurück, ob die übergebene Datei momentan exklusiv zu haben ist.
         ' Prüft, ob die angegeben Datei aktuell durch eine
         ' andere Anwendung in Benutzung ist
@@ -224,7 +308,7 @@ Public Class ClassFilehandle
                 ' Ist ein Fehler aufgetreten, so wird nach außen hin generell
                 ' davon ausgegangen, dass die Datei in Benutzung ist (obwohl
                 ' auch andere Ursachen, etwa Rechteprobleme, möglich sind).
-                LOGGER.Info(">> FileInUse Message: " & ex.Message)
+                Logger.Info(">> FileInUse Message: " & ex.Message)
                 IsFileInUse = True
             Finally
                 ' Die eventuell geöffnete Datei schließen
@@ -234,7 +318,7 @@ Public Class ClassFilehandle
         End If
 
     End Function
-    Public Shared Function Versionierung_Datei(Dateiname As String)
+    Public Function Versionierung_Datei(Dateiname As String)
         Dim extension
         Dim _NewFileString
         Try
@@ -250,15 +334,15 @@ Public Class ClassFilehandle
                 _NewFileString = _neuername
             Else
                 Do While File.Exists(_neuername & extension)
-                    version = version + 1
+                    version += 1
                     _neuername = Stammname & "~" & version
                     _NewFileString = _neuername
                 Loop
             End If
             Return _NewFileString & extension
         Catch ex As Exception
-            LOGGER.Info(" - Error in versioning file - error: " & vbNewLine & ex.Message)
-            LOGGER.Error(ex)
+            Logger.Info(" - Error in versioning file - error: " & vbNewLine & ex.Message)
+            Logger.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in versioning file:")
             Return ""
         End Try
@@ -270,8 +354,8 @@ Public Class ClassFilehandle
     ''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
     ''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen 
     ''' im Dateinamen</param>
-    Public Shared Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
-        LOGGER.Info(" >> Filename before CleanFilename: '" & sFilename & "'")
+    Public Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
+        Logger.Info(" >> Filename before CleanFilename: '" & sFilename & "'")
         If sFilename.Contains(".\") Then
             sFilename = sFilename.Replace(".\", "\")
         End If
@@ -286,7 +370,7 @@ Public Class ClassFilehandle
         sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
         'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars()))
         Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar))
-        LOGGER.Info(" >> Filename after CleanFilename: '" & sFilename & "'")
+        Logger.Info(" >> Filename after CleanFilename: '" & sFilename & "'")
         Return sFilename
     End Function
 End Class

Global_Indexer/ClassFolderWatcher.vb

@@ -1,10 +1,25 @@
 Imports System.IO
 Imports System.Threading
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
 
 Public Class ClassFolderWatcher
-    Public Shared FolderWatcher As FileSystemWatcher
-    Public Shared FolderWatcher_SCAN As FileSystemWatcher
-    Public Shared Function Restart_FolderWatch()
+    Inherits BaseClass
+
+    Public FolderWatcher As FileSystemWatcher
+    Public FolderWatcher_SCAN As FileSystemWatcher
+
+    Public Event FileCreated As EventHandler(Of FileSystemEventArgs)
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Private Sub OnCreated(source As Object, e As IO.FileSystemEventArgs)
+        RaiseEvent FileCreated(source, e)
+    End Sub
+
+    Public Sub Restart_FolderWatch()
         Try
             If FolderWatcher.EnableRaisingEvents = True Then
                 'Gestartet also Stoppen
@@ -12,41 +27,40 @@ Public Class ClassFolderWatcher
                 FW_started = False
                 'FolderWatch neu instanzieren
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch neu instanziert")
+
+                Logger.Info(" >> FolderWatch neu instanziert")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
             End If
         Catch ex As Exception
-            LOGGER.Info($"Error in Restart_FolderWatch: {ex.Message}")
-            LOGGER.Error(ex)
+            Logger.Info($"Error in Restart_FolderWatch: {ex.Message}")
+            Logger.Error(ex)
         End Try
-    End Function
-    Public Shared Function Restart_FolderWatchSCAN()
+    End Sub
+    Public Sub Restart_FolderWatchSCAN()
         Try
             If FolderWatcher_SCAN.EnableRaisingEvents = True Then
                 'Gestartet also Stoppen
                 FolderWatcher_SCAN.EnableRaisingEvents = False
                 'FolderWatch neu instanzieren
                 FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatchScan neu instanziert")
+                Logger.Info(" >> FolderWatchScan neu instanziert")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
-                'SaveConfigValue("FWSCAN_started", "True")
                 CONFIG.Config.FolderWatchScanStarted = True
                 CONFIG.Save()
             End If
         Catch ex As Exception
-            LOGGER.Info($"Error in Restart_FolderWatchSCAN: {ex.Message}")
-            LOGGER.Error(ex)
+            Logger.Info($"Error in Restart_FolderWatchSCAN: {ex.Message}")
+            Logger.Error(ex)
         End Try
-    End Function
-    Public Shared Function StartStop_FolderWatch()
+    End Sub
+    Public Function StartStop_FolderWatch() As Integer
         Try
             If CURRENT_FOLDERWATCH = "" Then
                 'MsgBox("Bitte definieren Sie einen Überwachungsordner:", MsgBoxStyle.Exclamation)
@@ -54,12 +68,11 @@ Public Class ClassFolderWatcher
             End If
             If FolderWatcher Is Nothing Then
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Gestartet")
+                Logger.Info(" >> FolderWatch Gestartet")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
                 Return 1
@@ -68,12 +81,11 @@ Public Class ClassFolderWatcher
                 ' Dim watcher As New FileSystemWatcher()
                 ' watcher.Path = CURRENT_FOLDERWATCH
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Gestartet")
+                Logger.Info(" >> FolderWatch Gestartet")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
                 Return 1
@@ -81,30 +93,17 @@ Public Class ClassFolderWatcher
                 'Gestartet also Stoppen
                 FolderWatcher.EnableRaisingEvents = False
                 FW_started = False
-                LOGGER.Info(" >> FolderWatch gestoppt")
-                'SaveConfigValue("FW_started", "False")
+                Logger.Info(" >> FolderWatch gestoppt")
                 CONFIG.Config.FolderWatchStarted = False
                 CONFIG.Save()
                 Return 0
             End If
-            'If watcher.EnableRaisingEvents = False Then
-            '    watcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-            '    LOGGER.Info(" - vFolderWatch.Gestartet")
-            '    watcher.IncludeSubdirectories = False
-            '    watcher.EnableRaisingEvents = True
-            '    AddHandler watcher.Created, AddressOf OnCreated
-            '    Return 1
-            'Else
-            '    'Gestartet also Stoppen
-            '    watcher.EnableRaisingEvents = False
-            '    Return 0
-            'End If
         Catch ex As Exception
             MsgBox("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return 99
         End Try
     End Function
-    Public Shared Function StartStop_FolderWatchSCAN()
+    Public Function StartStop_FolderWatchSCAN() As Integer
         Try
             If CURRENT_SCAN_FOLDERWATCH = "" Then
                 If FolderWatcher.EnableRaisingEvents = True Then
@@ -122,7 +121,7 @@ Public Class ClassFolderWatcher
             End If
             If FolderWatcher_SCAN Is Nothing Then
                 FolderWatcher_SCAN = New FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Scan Gestartet")
+                Logger.Info(" >> FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -134,7 +133,7 @@ Public Class ClassFolderWatcher
                 ' Dim watcher As New FileSystemWatcher()
                 ' watcher.Path = CURRENT_FOLDERWATCH
                 FolderWatcher_SCAN = New FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Scan Gestartet")
+                Logger.Info(" >> FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -144,8 +143,7 @@ Public Class ClassFolderWatcher
             Else
                 'Gestartet also Stoppen
                 FolderWatcher_SCAN.EnableRaisingEvents = False
-                LOGGER.Info(" >> FolderWatch Scan gestoppt")
-                'SaveConfigValue("FWSCAN_started", "False")
+                Logger.Info(" >> FolderWatch Scan gestoppt")
                 CONFIG.Config.FolderWatchScanStarted = False
                 CONFIG.Save()
                 Return 0
@@ -156,12 +154,12 @@ Public Class ClassFolderWatcher
             Return 99
         End Try
     End Function
-    Public Shared Function Stop_FWSCAN()
+    Public Function Stop_FWSCAN() As Boolean
         If FolderWatcher.EnableRaisingEvents = True Then
             'Gestartet also Stoppen
             FolderWatcher.EnableRaisingEvents = False
             FW_started = False
-            LOGGER.Info(" >> FolderWatch gestoppt")
+            Logger.Info(" >> FolderWatch gestoppt")
             'SaveConfigValue("FW_started", "False")
             CONFIG.Config.FolderWatchStarted = True
             CONFIG.Save()
@@ -170,36 +168,31 @@ Public Class ClassFolderWatcher
             Return False
         End If
     End Function
-    Private Shared Sub OnCreated(source As Object, e As FileSystemEventArgs)
-        If ClassDatabase.DatabaseConnectionTimeout = True Then
-            LOGGER.Info(">> File handling aborted because of database timeout error!")
-            Exit Sub
-        End If
+    'Private Sub OnCreated(source As Object, e As FileSystemEventArgs)
+    '    Try
+    '        For Each row As DataRow In DTEXCLUDE_FILES.Rows
+    '            Dim content As String = row.Item(0).ToString.ToLower
+    '            If e.FullPath.ToLower.Contains(content) Then
+    '                Exit Sub
+    '            End If
+    '        Next
 
-        Try
-            For Each row As DataRow In DTEXCLUDE_FILES.Rows
-                Dim content As String = row.Item(0).ToString.ToLower
-                If e.FullPath.ToLower.Contains(content) Then
-                    Exit Sub
-                End If
-            Next
+    '        Dim oHandleType As String
+    '        If e.FullPath.ToLower.EndsWith(".msg") Then
+    '            oHandleType = "|FW_OUTLOOK_MESSAGE|"
+    '        Else
+    '            oHandleType = "|FW_SIMPLEINDEXER|"
+    '        End If
+    '        'Die Datei übergeben
+    '        Logger.Info(">> OnCreated-File:" & e.FullPath)
 
-            Dim oHandleType As String
-            If e.FullPath.ToLower.EndsWith(".msg") Then
-                oHandleType = "|FW_OUTLOOK_MESSAGE|"
-            Else
-                oHandleType = "|FW_SIMPLEINDEXER|"
-            End If
-            'Die Datei übergeben
-            LOGGER.Info(">> OnCreated-File:" & e.FullPath)
+    '        If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
+    '            FileHandler.Decide_FileHandle(e.FullPath, oHandleType)
+    '        End If
+    '    Catch ex As Exception
+    '        MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in folder_watch_Created")
+    '    End Try
 
-            If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
-                ClassFilehandle.Decide_FileHandle(e.FullPath, oHandleType)
-            End If
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in folder_watch_Created")
-        End Try
-
-    End Sub
+    'End Sub
 
 End Class

Global_Indexer/ClassFormFunctions.vb

@@ -1,74 +0,0 @@
-Imports System.Text.RegularExpressions
-Public Class ClassFormFunctions
-    Public Shared Function GetConnectionString(id As Integer)
-        Dim connectionString As String = ""
-        Try
-            'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id)
-            Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id)
-            If DTConnection.Rows.Count = 1 Then
-                Dim CSType = DTConnection.Rows(0).Item("SQL_PROVIDER").ToString.ToUpper
-                Select Case CSType
-                    Case "MS-SQL".ToUpper
-                        If DTConnection.Rows(0).Item("USERNAME").ToString.ToLower = "winauth" Then
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        End If
-                    Case "MS-SQLServer".ToUpper
-                        If DTConnection.Rows(0).Item("USERNAME").ToString.ToLower = "winauth" Then
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        End If
-
-                    Case "Oracle".ToUpper
-                        If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then
-                            connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                               DTConnection.Rows(0).Item("DATENBANK") & ")));User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Persist Security Info=True;User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";Unicode=True"
-                        End If
-                        'Dim conn As New OracleConnectionStringBuilder
-
-                        'If chkOR_ohne_TNS.Checked Then
-                        '    connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & SERVERTextBox.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
-                        '        DATENBANKTextBox.Text & ")));User Id=" & USERNAMETextBox.Text & ";Password=" & PASSWORDTextBox.Text & ";"
-                        'Else
-                        '    conn.DataSource = DATENBANKTextBox.Text
-                        '    conn.UserID = USERNAMETextBox.Text
-                        '    conn.Password = PASSWORDTextBox.Text
-                        '    conn.PersistSecurityInfo = True
-                        '    conn.ConnectionTimeout = 120
-                        '    connstr = conn.ConnectionString
-                        'End If
-
-
-
-                        'Data Source=MyOracleDB;User Id=myUsername;Password=myPassword;Integrated Security=no;
-
-                    Case Else
-                        LOGGER.Info(" - ConnectionType not integrated")
-                        MsgBox("ConnectionType not integrated", MsgBoxStyle.Critical, "Please check connection:")
-                End Select
-            End If
-
-        Catch ex As Exception
-            LOGGER.Info(" - Unexpected Error in GetConnectionString:" & vbNewLine & ex.Message)
-            LOGGER.Error(ex)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetConnectionString:")
-
-        End Try
-        Return connectionString
-    End Function
-    Public Shared Function CleanInput(strIn As String) As String
-        ' Replace invalid characters with empty strings.
-        Try
-            Return Regex.Replace(strIn, "[^\w\.@-]", "")
-            ' If we timeout when replacing invalid characters, 
-            ' we should return String.Empty.
-        Catch e As RegexMatchTimeoutException
-            Return String.Empty
-        End Try
-    End Function
-   
-End Class

Global_Indexer/ClassHelper.vb

@@ -1,65 +0,0 @@
-Imports System.Text
-Imports System.Text.RegularExpressions
-
-Public Class ClassHelper
-    Public Shared Function encode_utf8(ByVal str As String) As String
-        Try
-            'supply True as the construction parameter to indicate
-            'that you wanted the class to emit BOM (Byte Order Mark)
-            'NOTE: this BOM value is the indicator of a UTF-8 string
-            Dim utf8Encoding As New System.Text.UTF8Encoding(True)
-            Dim encodedString() As Byte
-            encodedString = utf8Encoding.GetBytes(str)
-            LOGGER.Info(String.Format(" >> String {0} was encoded via utf8 to {1}", str, utf8Encoding.GetString(encodedString)))
-            Return utf8Encoding.GetString(encodedString)
-        Catch ex As Exception
-            LOGGER.Info("Unexpected error in encode_utf8: " & ex.Message)
-            LOGGER.Error(ex)
-            Return Nothing
-        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
-            LOGGER.Info("Unexpected error in StringAsUtf8Bytes: " & ex.Message)
-            LOGGER.Error(ex)
-            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
-            LOGGER.Info("Unexpected error in CheckSpecialSigns: " & ex.Message)
-            LOGGER.Error(ex)
-            Return 0
-        End Try
-    End Function
-    Public Shared Sub Refresh_RegexTable()
-        CURRENT_DT_REGEX = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FUNCTION_REGEX")
-    End Sub
-
-    ''' <summary>
-    ''' Überprüft einen Wert auf verschiedene Arten von "Null" und gibt einen Standard-Wert zurück, wenn der Wert "Null" ist.
-    ''' </summary>
-    ''' <param name="value">Der zu überprüfende Wert</param>
-    ''' <param name="defaultValue">Der Standard Wert</param>
-    ''' <returns>value oder wenn dieser "Null" ist, defaultValue</returns>
-    Public Shared Function NotNull(Of T)(ByVal value As T, ByVal defaultValue As T) As T
-        If IsNothing(value) OrElse String.IsNullOrEmpty(value.ToString) OrElse IsDBNull(value) Then
-            Return defaultValue
-        Else
-            Return value
-        End If
-    End Function
-
-End Class

Global_Indexer/ClassIDBData.vb

@@ -9,8 +9,11 @@
     ''' 
     Public Function Init()
         Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE"
-        DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB)
+        'DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB)
+        DTVWIDB_BE_ATTRIBUTE = DATABASE_IDB.GetDatatable(oSQL)
+        Return True
     End Function
+
     Public IDBSystemIndices As List(Of String)
     Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String()
         Try
@@ -101,7 +104,10 @@
                 LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ")
             End If
             Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({IDB_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
-            oAttributeValue = ClassDatabase.Return_Datatable_CS(oFNSQL, CONNECTION_STRING_IDB)
+
+            'oAttributeValue = ClassDatabase.Return_Datatable_CS(oFNSQL, CONNECTION_STRING_IDB)
+            oAttributeValue = DATABASE_IDB.GetDatatable(oFNSQL)
+
             Dim odt As DataTable = oAttributeValue
             If odt.Rows.Count = 1 Then
                 oAttributeValue = odt.Rows(0).Item(0)
@@ -122,7 +128,9 @@
                 oID_IS_FOREIGN = 1
             End If
             Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {IDB_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}"
-            ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+
+            'DATABASE_ECM.ExecuteNonQuery_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+            DATABASE_IDB.ExecuteNonQuery(oDELSQL)
 
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -133,7 +141,9 @@
     Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object
         Try
             Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'"
-            ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+
+            'DATABASE_ECM.ExecuteNonQuery_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+            DATABASE_IDB.ExecuteNonQuery(oDELSQL)
 
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -206,8 +216,11 @@
 
                 For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
                     Dim oSuccess As Boolean = False
-                    Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
-                    oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+                    Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1)}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
+
+                    'oSuccess = DATABASE_ECM.ExecuteNonQuery_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+                    oSuccess = DATABASE_IDB.ExecuteNonQuery(oFNSQL)
+
                     If oSuccess = False Then
                         Return False
                     End If
@@ -215,7 +228,9 @@
                 Return True
             Else
                 Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
-                Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+
+                'Return DATABASE_ECM.ExecuteNonQuery_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+                Return DATABASE_IDB.ExecuteNonQuery(oFNSQL)
             End If
 
         Catch ex As Exception

Global_Indexer/ClassIndexFunctions.vb

@@ -33,7 +33,8 @@ Public Class ClassIndexFunctions
 
             'If oResult.Rows.Count = 0 Then
             oSQL = "SELECT * FROM TBGI_HISTORY WHERE UPPER(FILE_HASH) = UPPER('" & oHash & "') ORDER BY ADDED_WHEN"
-            Dim oResult = ClassDatabase.Return_Datatable_CS(oSQL, MyConnectionString, True)
+            'Dim oResult = ClassDatabase.Return_Datatable_CS(oSQL, MyConnectionString, True)
+            Dim oResult = DATABASE_ECM.GetDatatable(oSQL)
 
             If oResult Is Nothing Then
                 Return Nothing

Global_Indexer/ClassInit.vb

@@ -4,13 +4,10 @@ Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Windream
 Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Messaging
+Imports DigitalData.Modules.Database
 Imports DLLLicenseManager
-
 Public Class ClassInit
-    Public _lizenzManager As ClassLicenseManager
-
     Public Sub InitLogger()
-        ClassLogger.Init("", Environment.UserName)
         LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
                                   CompanyName:=My.Application.Info.CompanyName,
                                   ProductName:=My.Application.Info.ProductName)
@@ -45,12 +42,23 @@ Public Class ClassInit
         End If
 
         If MyConnectionString <> String.Empty Then
-            dbResult = ClassDatabase.Init()
+            ' === NEW ===
+            DATABASE_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString)
+            dbResult = DATABASE_ECM.DBInitialized
+
+            ' === OLD ===
+            'dbResult = ClassDatabase.Init()
         Else
             MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
             ERROR_STATE = "NO DB-CONNECTION"
             frmConfig_Basic.ShowDialog()
-            dbResult = ClassDatabase.Init()
+
+            ' === NEW ===
+            DATABASE_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString)
+            dbResult = DATABASE_ECM.DBInitialized
+
+            ' === OLD ===
+            'dbResult = ClassDatabase.Init()
         End If
 
         If dbResult = False Then
@@ -79,7 +87,7 @@ Public Class ClassInit
         Else
             If IDB_ACTIVE = False Then
                 Try
-                    WINDREAM = New Windream(LOGCONFIG, False, WMDrive, "\\windream\objects", True, "", "", "", "")
+                    WINDREAM = New Windream(LOGCONFIG, False, WMDrive, WINDREAM_BASEPATH, True, "", "", "", "")
                     If Not IsNothing(WINDREAM) Then
                         If WINDREAM.SessionLoggedin = True Then
                             LOGGER.Debug("windream initialisiert")
@@ -98,15 +106,15 @@ Public Class ClassInit
 
     Public Function Load_BasicConfig()
         Try
-            ClassDatabase.Init()
+            'ClassDatabase.Init()
             Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'Global-Indexer'"
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(oSql)
+            Dim DT As DataTable = DATABASE_ECM.GetDatatable(oSql)
             If DT.Rows.Count = 1 Then
                 GI_withWindream = DT.Rows(0).Item("BIT1")
                 'vWLaufwerk = DT.Rows(0).Item("STRING1")
             End If
             oSql = "SELECT * FROM TBDD_BASECONFIG"
-            DT = ClassDatabase.Return_Datatable(oSql)
+            DT = DATABASE_ECM.GetDatatable(oSql)
             If DT.Rows.Count = 1 Then
                 WMDrive = DT.Rows(0).Item("WM_DRIVE")
                 Return True
@@ -122,8 +130,12 @@ Public Class ClassInit
 
     Public Sub Init_Folderwatch()
         Try
+            FILE_HANDLER = New ClassFileHandler(LOGCONFIG)
+            FOLDER_WATCHER = New ClassFolderWatcher(LOGCONFIG)
+            AddHandler FOLDER_WATCHER.FileCreated, AddressOf OnCreated
+
             Dim sql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID
-            Dim folderwatchPath = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+            Dim folderwatchPath = DATABASE_ECM.GetScalarValue(sql)
 
             folderwatchPath = IIf(IsDBNull(folderwatchPath), "", folderwatchPath)
 
@@ -149,7 +161,7 @@ Public Class ClassInit
 
             FW_started = True
             FWFunction_STARTED = True
-            ClassFolderWatcher.StartStop_FolderWatch()
+            FOLDER_WATCHER.StartStop_FolderWatch()
         Catch ex As Exception
             MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical)
             LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
@@ -158,7 +170,7 @@ Public Class ClassInit
 
         Try
             Dim sql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID
-            Dim folderwatchScanPath = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+            Dim folderwatchScanPath = DATABASE_ECM.GetScalarValue(sql)
 
             folderwatchScanPath = IIf(IsDBNull(folderwatchScanPath), "", folderwatchScanPath)
 
@@ -180,56 +192,47 @@ Public Class ClassInit
 
 
             FWFunction_STARTED = True
-            ClassFolderWatcher.StartStop_FolderWatchSCAN()
+            FOLDER_WATCHER.StartStop_FolderWatchSCAN()
         Catch ex As Exception
             MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical)
             LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
             START_INCOMPLETE = True
         End Try
-
-
-
-        'Try
-        '    'Die FolderWatch starten
-        'Dim sql1 = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & CURRENT_USER_ID
-        '    Dim folderwatch = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True)
-        '    sql1 = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & CURRENT_USER_ID
-        '    Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True)
-        '    If Not folderwatch Is Nothing Then
-        '        CURRENT_FOLDERWATCH = folderwatch
-        '        If FW_started = True Then
-        '            If CURRENT_FOLDERWATCH = "" Then
-        '                FW_started = False
-        '                SaveConfigValue("FW_started", "False")
-        '            Else
-        '                FW_ISSTARTED = True
-        '                ClassFolderWatcher.StartStop_FolderWatch()
-        '            End If
-
-        '        End If
-        '    Else
-        '        LOGGER.Info("Init_Folderwatch: folderwatch path is nothing!")
-        '    End If
-        '    If Not folderwatch_SCAN Is Nothing Then
-        '        CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
-        '        If FWSCAN_started = True Then
-        '            FW_ISSTARTED = True
-        '            ClassFolderWatcher.StartStop_FolderWatchSCAN()
-        '        End If
-        '    Else
-        '        LOGGER.Info("Init_Folderwatch: folderwatch_SCAN path is nothing!")
-        '    End If
-        'Catch ex As Exception
-        '    LOGGER.Info("Unexpected Error in Init_Folderwatch: " & ex.Message)
-        '    START_INCOMPLETE = True
-        'End Try
     End Sub
+
+    Private Sub OnCreated(source As Object, e As IO.FileSystemEventArgs)
+        Try
+            For Each row As DataRow In DTEXCLUDE_FILES.Rows
+                Dim content As String = row.Item(0).ToString.ToLower
+                If e.FullPath.ToLower.Contains(content) Then
+                    Exit Sub
+                End If
+            Next
+
+            Dim oHandleType As String
+            If e.FullPath.ToLower.EndsWith(".msg") Then
+                oHandleType = "|FW_OUTLOOK_MESSAGE|"
+            Else
+                oHandleType = "|FW_SIMPLEINDEXER|"
+            End If
+            'Die Datei übergeben
+            LOGGER.Info(">> OnCreated-File:" & e.FullPath)
+
+            If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
+                FILE_HANDLER.Decide_FileHandle(e.FullPath, oHandleType)
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in folder_watch_Created")
+        End Try
+
+    End Sub
+
     Public Sub InitUserLogin()
         Try
             Dim oSql As String
 
             oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1)
-            Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(oSql)
+            Dim DT_CHECKUSER_MODULE As DataTable = DATABASE_ECM.GetDatatable(oSql)
             If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
                 LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0")
                 START_INCOMPLETE = True
@@ -238,22 +241,25 @@ Public Class ClassInit
                 Exit Sub
             End If
             If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
-                If DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") = 0 And IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")) Then
+
+                Dim oRow As DataRow = DT_CHECKUSER_MODULE.Rows(0)
+
+                If oRow.Item("USER_ID") = 0 And IsDBNull(oRow.Item("USER_SURNAME")) Then
                     LOGGER.Info("User '" & Environment.UserName & "' not configured in Useradministration!")
                     START_INCOMPLETE = True
                     Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
                     Exit Sub
                 End If
-                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
-                USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
-                USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
-                USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
-                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
-                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
-                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-                USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                USER_IN_MODULE = oRow.Item("MODULE_ACCESS")
+                USER_ID = oRow.Item("USER_ID")
+                USER_SURNAME = IIf(IsDBNull(oRow.Item("USER_SURNAME")), "", oRow.Item("USER_SURNAME"))
+                USER_PRENAME = IIf(IsDBNull(oRow.Item("USER_PRENAME")), "", oRow.Item("USER_PRENAME"))
+                USER_SHORTNAME = IIf(IsDBNull(oRow.Item("USER_SHORTNAME")), "", oRow.Item("USER_SHORTNAME"))
+                USER_EMAIL = IIf(IsDBNull(oRow.Item("USER_EMAIL")), "", oRow.Item("USER_EMAIL"))
+                USER_LANGUAGE = oRow.Item("USER_LANGUAGE")
+                USER_IN_MODULE = oRow.Item("MODULE_ACCESS")
+                USER_IS_ADMIN = oRow.Item("IS_ADMIN")
+                USERCOUNT_LOGGED_IN = oRow.Item("USERCOUNT_LOGGED_IN")
                 ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
                 If USER_IN_MODULE = False Then
                     LOGGER.Info(" - User: " & Environment.UserName & " nicht für Modul freigegben!")
@@ -263,12 +269,12 @@ Public Class ClassInit
 
                     Exit Sub
                 End If
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
+                USER_IS_ADMIN = oRow.Item("IS_ADMIN")
 
                 ClassLicence.Refresh_Licence()
 
                 Dim sql1 = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1"
-                DOCTYPE_COUNT_ACTUAL = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True)
+                DOCTYPE_COUNT_ACTUAL = DATABASE_ECM.GetScalarValue(sql1)
                 If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Ihre Anzahl von konfigurierbaren Dokumentarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'." & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information)
@@ -276,24 +282,21 @@ Public Class ClassInit
                         MsgBox("Your amount of configurable documenttypes is limited to " & LICENSE_DOCTYPE_COUNT.ToString & " doctypes. You can not add more doctypes!" & vbNewLine & "Please contact Digital Data for further licensedetails", MsgBoxStyle.Information)
                     End If
                 End If
-                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                USER_LANGUAGE = oRow.Item("USER_LANGUAGE")
 
                 oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
-                ClassDatabase.Execute_non_Query(oSql, True)
+                DATABASE_ECM.ExecuteNonQuery(oSql)
                 oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'Global-Indexer', 1)"
-                ClassDatabase.Execute_non_Query(oSql)
+                DATABASE_ECM.ExecuteNonQuery(oSql)
                 oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')"
-                ' Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
-                'LOGGER.Info(" >> Anzahl Angemeldete User: " & anzahl.ToString)
-                ' UserLoggedin = CInt(anzahl)
-                ' UserLoggedin += 1
+
                 If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
                     MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                     LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!")
                     If USER_IS_ADMIN = False Then
                         'Anmeldung wieder herausnehmen
                         oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'"
-                        ClassDatabase.Execute_non_Query(oSql, True)
+                        DATABASE_ECM.ExecuteNonQuery(oSql)
                         LOGGER.Info(" - Wieder abgemeldet")
                         START_INCOMPLETE = True
                     End If

Global_Indexer/ClassLayout.vb

@@ -140,16 +140,17 @@ Public Class ClassSetting
 End Class
 
 Public Class ClassLayout
-    Private _filename As String
+    Private ReadOnly _filename As String
+    Private ReadOnly _settings As XmlWriterSettings
     Private _reader As XmlReader
-    Private _settings As XmlWriterSettings
 
     Public Sub New(filename As String)
         _filename = filename
 
-        _settings = New XmlWriterSettings()
-        _settings.Encoding = System.Text.Encoding.UTF8
-        _settings.Indent = True
+        _settings = New XmlWriterSettings With {
+            .Encoding = System.Text.Encoding.UTF8,
+            .Indent = True
+        }
     End Sub
 
     Public Sub Save(settings As System.Collections.Generic.List(Of ClassSetting))

Global_Indexer/ClassLicence.vb

@@ -1,15 +1,17 @@
 Imports System.Globalization
 Imports DLLLicenseManager
+Imports DigitalData.Modules.License
+
 Public Class ClassLicence
-    Public Shared License_Date As Date
-    Private Shared _lizenzManager As ClassLicenseManager
+    Public Shared LicenseDate As Date
+    Public Shared LicenseManager As LicenseManagerLegacy
     Public Shared Sub Refresh_Licence()
         Try
-            _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
+            LicenseManager = New LicenseManagerLegacy(LOGCONFIG, "#DigitalData35452!#", "")
             Dim sql As String = "SELECT LICENSEKEY FROM TBGI_CONFIGURATION WHERE GUID = 1"
 
-            Dim licEncoded As String = ClassDatabase.Execute_Scalar(sql, MyConnectionString)
-            Dim licString As String = _lizenzManager.DecodeLicenseKey(licEncoded)
+            Dim licEncoded As String = DATABASE_ECM.GetScalarValue(sql)
+            Dim licString As String = LicenseManager.DecodeLicenseKey(licEncoded)
             Dim licArray() As String = licString.ToString.Split("#")
 
             If licEncoded <> "" Then
@@ -20,10 +22,10 @@ Public Class ClassLicence
 
             LOGGER.Debug("License Date is {0}", licArray(1))
 
-            License_Date = Date.ParseExact(licArray(1), "dd.MM.yyyy", CultureInfo.InvariantCulture)
+            LicenseDate = Date.ParseExact(licArray(1), "dd.MM.yyyy", CultureInfo.InvariantCulture)
             'License_Date = CDate(split(1))
 
-            If License_Date < Now Then
+            If LicenseDate < Now Then
                 If USER_LANGUAGE = "de-DE" Then
                     MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & licArray(1) & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation)
                 Else
@@ -51,9 +53,9 @@ Public Class ClassLicence
     Public Shared Function license_is_Valid()
         If LICENSE_EXPIRED Then
             If USER_LANGUAGE = "de-DE" Then
-                MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & License_Date & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation)
+                MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & LicenseDate & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation)
             Else
-                MsgBox("Your license has expired!" & vbNewLine & "Last Valid Date: " & License_Date & vbNewLine & "Please contact Digital Data", MsgBoxStyle.Exclamation)
+                MsgBox("Your license has expired!" & vbNewLine & "Last Valid Date: " & LicenseDate & vbNewLine & "Please contact Digital Data", MsgBoxStyle.Exclamation)
             End If
 
             Return False

Global_Indexer/ClassLogger.vb

@@ -1,215 +0,0 @@
-Imports System.IO
-Public Class ClassLogger
-    Public Shared DateiSpeicherort As String = Nothing
-    Public Shared DateiPrefix As String = ""
-    Public Shared Datei As IO.File = Nothing
-    Public Shared logDateiname As String = ""
-    Private Shared StreamWriter As IO.StreamWriter = Nothing
-    Private Shared HasInformedAboutError As Boolean = False
-    ' eine Art Konstruktor
-    Public Shared Sub Init(ByVal speicherort As String, Optional ByVal prefix As String = "", Optional ByVal appendFile As Boolean = True)
-        ' initialisiert den Speicherort
-        ClassLogger.SetSpeicherort(speicherort)
-        ' wenn ein Prfix gesetzt wurde
-        If Not prefix = "" Then
-            ' initialisiert das Prefix
-            ClassLogger.SetPrefix(prefix)
-        End If
-        Dim str As String = ClassLogger.DateiSpeicherort & "\" & ClassLogger.DateiPrefix & System.DateTime.Now.ToString("yyyy_MM_dd") & ".txt"
-        Dim anz As Integer = 1
-        Do While File.Exists(str)
-            Dim info As New FileInfo(str)
-            Dim length As Long = info.Length
-            If length > 5000000 Then
-                str = IO.Path.GetDirectoryName(str)
-                str = str & "\" & ClassLogger.DateiPrefix & System.DateTime.Now.ToString("yyyy_MM_dd") & "(" & anz.ToString & ").txt"
-                anz = anz + 1
-            Else
-                Exit Do
-            End If
-        Loop
-        ClassLogger.logDateiname = str
-        If Not appendFile Then
-            ' der Versuch die Datei zu löschen
-            'Try
-            '    My.Computer.FileSystem.DeleteFile(ClassNILogger.Dateiname, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.DeletePermanently)
-            'Catch ex As Exception
-            '    ' bei Fehler besteht kein Schreibrecht auf die Datei oder Datei existiert nicht
-            '    ' ALSO: alles Okay soweit
-            'End Try
-            My.Computer.FileSystem.WriteAllText(ClassLogger.logDateiname, String.Empty, False)
-        End If
-        ' testen ob sich die Datei öffnen und beschreiben lässt
-        'ClassNILogger.CheckIsLogWritable()
-    End Sub
-
-    ' legt den Speicherort fest
-    Public Shared Sub SetSpeicherort(ByVal speicherort As String)
-        Dim f As New IO.DirectoryInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Digital Data\Global Indexer\Log"))
-
-        If speicherort = "" Then
-            If f.Exists = False Then
-                IO.Directory.CreateDirectory(f.ToString())
-            End If
-            ClassLogger.DateiSpeicherort = f.ToString()
-        Else
-            ClassLogger.DateiSpeicherort = speicherort
-        End If
-
-        'Dim f As New IO.DirectoryInfo(My.Application.Info.DirectoryPath & "\Log")
-        'If speicherort = "" Then
-        '    If f.Exists = False Then
-        '        IO.Directory.CreateDirectory(My.Application.Info.DirectoryPath & "\Log")
-        '    End If
-        '    ClassLogger.DateiSpeicherort = My.Application.Info.DirectoryPath & "\Log\"
-        'Else
-        '    ClassLogger.DateiSpeicherort = speicherort
-        'End If
-    End Sub
-
-    ' legt das Prefix für den Dateinamen fest
-    Public Shared Sub SetPrefix(ByVal prefix As String)
-        ClassLogger.DateiPrefix = prefix
-    End Sub
-
-    Public Shared Sub Add(ByVal information As String, Optional ByVal ACHTUNG As Boolean = True)
-        If ClassLogger.OpenFile Then
-            Try
-                If ACHTUNG Then
-                    ClassLogger.StreamWriter.WriteLine(Now.ToString & "# ATTENTION #: " & information)
-                Else
-                    ClassLogger.StreamWriter.WriteLine(Now.ToString & information)
-                End If
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-        End If
-    End Sub
-    Public Shared Sub Add(ByVal ex As Exception)
-        If ClassLogger.OpenFile Then
-            Try
-                ClassLogger.StreamWriter.WriteLine(Now.ToString & "##### Exception ####")
-                ClassLogger.StreamWriter.WriteLine(Now.ToString & "##### Fehler: " & ex.Message & " Source [" & ex.Source & "]")
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-        End If
-    End Sub
-    ' öffnet eine Datei zum Schreiben
-    Private Shared Function OpenFile()
-        Try
-            ' wenn ein Speicherort festgelegt wurde
-            If Not ClassLogger.DateiSpeicherort = Nothing Then
-                ' den Dateienamen definieren
-                Dim dateiname As String = ClassLogger.logDateiname
-                ' Datei anlegen wenn noch nicht vorhanden
-                My.Computer.FileSystem.WriteAllText(dateiname, String.Empty, True)
-                ' die Datei zum Schreiben öffnen
-                ClassLogger.StreamWriter = New IO.StreamWriter(dateiname, True, System.Text.Encoding.UTF8)
-            End If
-            ' wenn die Datei erfolgreich geöffnet wurde
-            If ClassLogger.StreamWriter IsNot Nothing Then
-                Return True
-            Else
-                Return False
-            End If
-        Catch ex As Exception
-            Return False
-        End Try
-
-    End Function
-
-    ' öffnet eine Datei zum Schreiben
-    Private Shared Function OpenFile(ByVal DateiSpeicherort As String, ByVal DateiPrefix As String)
-
-        Try
-
-            ' wenn ein Speicherort festgelegt wurde
-            If Not DateiSpeicherort = Nothing And ClassLogger.CheckIsLogWritable() Then
-
-                ' den Dateienamen definieren
-                Dim dateiname As String = ClassLogger.logDateiname
-                ' Datei anlegen wenn noch nicht vorhanden
-                My.Computer.FileSystem.WriteAllText(dateiname, String.Empty, True)
-
-                ' die Datei zum Schreiben öffnen
-                ClassLogger.StreamWriter = New IO.StreamWriter(dateiname, True, System.Text.Encoding.UTF8)
-            End If
-
-            ' wenn die Datei erfolgreich geöffnet wurde
-            If ClassLogger.StreamWriter IsNot Nothing Then
-                Return True
-            Else
-                Return False
-            End If
-
-        Catch ex As Exception
-            Return False
-        End Try
-
-    End Function
-
-
-    ' schliesst die geöffnete Datei
-    Private Shared Sub CloseFile()
-
-        ' wenn eine Datei geöffnet ist
-        If ClassLogger.StreamWriter IsNot Nothing Then
-            ' die Datei schliessen
-            ClassLogger.StreamWriter.Close()
-            ClassLogger.StreamWriter = Nothing
-        End If
-    End Sub
-
-
-    Public Shared Function CheckIsLogWritable()
-
-        If ClassLogger.OpenFile Then
-            Try
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-                Return False
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-            Return False
-        End If
-
-        Return True
-    End Function
-
-
-    Public Shared Function CheckIsLogWritable(ByVal vDateiSpeicherort As String, ByVal vDateiPrefix As String)
-
-        If ClassLogger.OpenFile(vDateiSpeicherort, vDateiPrefix) Then
-            Try
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-                Return False
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-            Return False
-        End If
-
-        Return True
-    End Function
-
-
-    Private Shared Sub ShowErrorMessage()
-        If Not ClassLogger.HasInformedAboutError Then
-            MsgBox("Beim Öffnen der Logdatei ist ein Fehler aufgetreten. Bitte stellen Sie sicher das Sie sowohl über entsprechende Schreibrechte im Verzeichnis, als auch über ausreichend Speicherplatz zum Speichern der Logdatei verfügen." & _
-                   vbNewLine & vbNewLine & "Es wird keine Logdatei angelegt oder beschrieben." & vbNewLine & vbNewLine & "Im folgenden werden Sie über Fehler, den Log betreffend nicht weiter informiert, um den Ablauf von " & My.Application.Info.ProductName & " nicht zu stören.", _
-                   MsgBoxStyle.Information, "Unexpected error inm Öffnen der Logdatei")
-            ClassLogger.HasInformedAboutError = True
-        End If
-    End Sub
-End Class

Global_Indexer/ClassParamRefresh.vb

@@ -1,4 +1,6 @@
-Public Class ClassParamRefresh
+Imports DigitalData.Modules.Database
+
+Public Class ClassParamRefresh
     Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable)
         If DT_CHECKUSER.Rows.Count = 1 Then
             USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN")
@@ -7,14 +9,6 @@
             Catch ex As Exception
                 WORKING_MODE = ""
             End Try
-            'Try
-            '    ADDITIONAL_TITLE = DT_CHECKUSER.Rows(0).Item("ADDITIONAL_TITLE")
-            '    If ADDITIONAL_TITLE = String.Empty Then
-            '        ADDITIONAL_TITLE = My.Application.Info.ProductName
-            '    End If
-            'Catch ex As Exception
-            '    ADDITIONAL_TITLE = My.Application.Info.ProductName
-            'End Try
 
             Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
 
@@ -23,26 +17,26 @@
             For Each oMode In oSplitWorkMode
                 LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
                 If oMode.StartsWith("IDB_CONID!") Then
-                    Dim CON_ID = oMode.Replace("GLOBIX.IDB_CONID!", "")
-                    Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
+                    Dim oConnectionId = oMode.Replace("GLOBIX.IDB_CONID!", "")
+                    Dim oConString = DATABASE_ECM.Get_ConnectionStringforID(oConnectionId)
+
                     CONNECTION_STRING_IDB = oConString
+                    DATABASE_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+
                     Dim oSQL = $"SELECT * FROM TBIDB_ATTRIBUTE"
-                    Dim oDT As DataTable = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB)
+                    Dim oDT As DataTable = DATABASE_IDB.GetDatatable(oSQL)
+
                     If Not IsNothing(oDT) Then
                         If oDT.Rows.Count > 0 Then
                             IDB_ACTIVE = True
                         Else
-                            LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!")
+                            LOGGER.Warn($"Got an IDB-ConnID [{oConnectionId}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!")
                         End If
                     Else
-                        LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!")
+                        LOGGER.Warn($"Got an IDB-ConnID [{oConnectionId}] but check DT Attribute is Nothing!!")
                     End If
                 ElseIf oMode.StartsWith("IDB.LOG_INDEX") Then
                     IDB_LOG_INDEX = oMode.Replace("IDB.LOG_INDEX!", "")
-                    'ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
-                    '    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
-                    '    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
-
                 Else
                     LOGGER.Info($"Wrong oMode: {oMode}")
                 End If

Global_Indexer/ClassPatterns.vb

@@ -1,6 +1,7 @@
 Imports System.Text.RegularExpressions
 Imports DevExpress.XtraEditors
 Imports DigitalData.Controls.LookupGrid
+Imports DigitalData.Modules.Language
 Imports DigitalData.GUIs.GlobalIndexer
 Imports WINDREAMLib
 
@@ -41,10 +42,10 @@ Public Class ClassPatterns
 
     Public Const MAX_TRY_COUNT = 500
 
-    Private Shared regex As Regex = New Regex("{#(\w+)#([\.\w\d\s_-]+)}+")
-    Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT}
-    Private Shared complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
-    Private Shared simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
+    Private Shared ReadOnly regex As Regex = New Regex("{#(\w+)#([\.\w\d\s_-]+)}+")
+    Private Shared ReadOnly allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT}
+    Private Shared ReadOnly complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
+    Private Shared ReadOnly simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
 
     ''' <summary>
     ''' Wraps a pattern-type and -value in the common format: {#type#value}
@@ -230,16 +231,16 @@ Public Class ClassPatterns
 
                             If oLookupControl.Properties.MultiSelect Then
                                 Select Case oFoundType
-                                    Case "INTEGER"
+                                    Case ClassConstants.INDEX_TYPE_INTEGER
                                         oValue = String.Join(",", oLookupControl.Properties.SelectedValues)
-                                    Case "VARCHAR"
+                                    Case ClassConstants.INDEX_TYPE_VARCHAR
                                         Dim oWrapped = oLookupControl.Properties.SelectedValues
                                         oValue = String.Join(",", oWrapped)
                                     Case Else
                                         LOGGER.Warn("Lookup Control with [{0}] is not supported!", oFoundType)
                                 End Select
                             Else
-                                oValue = NotNull(oLookupControl.Properties.SelectedValues.Item(0), "")
+                                oValue = Utils.NotNull(oLookupControl.Properties.SelectedValues.Item(0), "")
                             End If
                         Catch ex As Exception
                             LOGGER.Error(ex)

Global_Indexer/ClassWindowAPI.vb

@@ -1,179 +0,0 @@
-Imports System.Data
-Imports System.Runtime.InteropServices
-Imports System.Text
-Imports System.Collections.Generic
-Public Class ClassWindowAPI
-    Public Class ApiWindow
-        Public MainWindowTitle As String = ""
-        Public ClassName As String = ""
-        Public hWnd As Int32
-    End Class
-
-    Private Delegate Function EnumCallBackDelegate(ByVal hwnd As Integer, ByVal lParam As Integer) As Integer
-
-    ' Top-level windows.
-    Private Declare Function EnumWindows Lib "user32" _
-     (ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer
-
-    ' Child windows.
-    Private Declare Function EnumChildWindows Lib "user32" _
-     (ByVal hWndParent As Integer, ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer
-
-    ' Get the window class.
-    Private Declare Function GetClassName _
-     Lib "user32" Alias "GetClassNameA" _
-     (ByVal hwnd As Integer, ByVal lpClassName As StringBuilder, ByVal nMaxCount As Integer) As Integer
-
-    ' Test if the window is visible--only get visible ones.
-    Private Declare Function IsWindowVisible Lib "user32" _
-     (ByVal hwnd As Integer) As Integer
-
-    ' Test if the window's parent--only get the one's without parents.
-    Private Declare Function GetParent Lib "user32" _
-     (ByVal hwnd As Integer) As Integer
-
-    ' Get window text length signature.
-    Private Declare Function SendMessage _
-     Lib "user32" Alias "SendMessageA" _
-     (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As Int32) As Int32
-
-    ' Get window text signature.
-    Private Declare Function SendMessage _
-     Lib "user32" Alias "SendMessageA" _
-     (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As StringBuilder) As Int32
-
-    Private _listChildren As New List(Of ApiWindow)
-    Private _listTopLevel As New List(Of ApiWindow)
-
-    Private _topLevelClass As String = ""
-    Private _childClass As String = ""
-
-    ''' <summary>
-    ''' Get all top-level window information
-    ''' </summary>
-    ''' <returns>List of window information objects</returns>
-    Public Overloads Function GetTopLevelWindows() As List(Of ApiWindow)
-
-        EnumWindows(AddressOf EnumWindowProc, &H0)
-
-        Return _listTopLevel
-
-    End Function
-
-    Public Overloads Function GetTopLevelWindows(ByVal className As String) As List(Of ApiWindow)
-
-        _topLevelClass = className
-
-        Return Me.GetTopLevelWindows()
-
-    End Function
-
-    ''' <summary>
-    ''' Get all child windows for the specific windows handle (hwnd).
-    ''' </summary>
-    ''' <returns>List of child windows for parent window</returns>
-    Public Overloads Function GetChildWindows(ByVal hwnd As Int32) As List(Of ApiWindow)
-
-        ' Clear the window list.
-        _listChildren = New List(Of ApiWindow)
-
-        ' Start the enumeration process.
-        EnumChildWindows(hwnd, AddressOf EnumChildWindowProc, &H0)
-
-        ' Return the children list when the process is completed.
-        Return _listChildren
-
-    End Function
-
-    Public Overloads Function GetChildWindows(ByVal hwnd As Int32, ByVal childClass As String) As List(Of ApiWindow)
-
-        ' Set the search
-        _childClass = childClass
-
-        Return Me.GetChildWindows(hwnd)
-
-    End Function
-
-    ''' <summary>
-    ''' Callback function that does the work of enumerating top-level windows.
-    ''' </summary>
-    ''' <param name="hwnd">Discovered Window handle</param>
-    ''' <returns>1=keep going, 0=stop</returns>
-    Private Function EnumWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32
-
-        ' Eliminate windows that are not top-level.
-        If GetParent(hwnd) = 0 AndAlso CBool(IsWindowVisible(hwnd)) Then
-
-            ' Get the window title / class name.
-            Dim window As ApiWindow = GetWindowIdentification(hwnd)
-
-            ' Match the class name if searching for a specific window class.
-            If _topLevelClass.Length = 0 OrElse window.ClassName.ToLower() = _topLevelClass.ToLower() Then
-                _listTopLevel.Add(window)
-            End If
-
-        End If
-
-        ' To continue enumeration, return True (1), and to stop enumeration 
-        ' return False (0).
-        ' When 1 is returned, enumeration continues until there are no 
-        ' more windows left.
-
-        Return 1
-
-    End Function
-
-    ''' <summary>
-    ''' Callback function that does the work of enumerating child windows.
-    ''' </summary>
-    ''' <param name="hwnd">Discovered Window handle</param>
-    ''' <returns>1=keep going, 0=stop</returns>
-    Private Function EnumChildWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32
-
-        Dim window As ApiWindow = GetWindowIdentification(hwnd)
-
-        ' Attempt to match the child class, if one was specified, otherwise
-        ' enumerate all the child windows.
-        If _childClass.Length = 0 OrElse window.ClassName.ToLower() = _childClass.ToLower() Then
-            _listChildren.Add(window)
-        End If
-
-        Return 1
-
-    End Function
-
-    ''' <summary>
-    ''' Build the ApiWindow object to hold information about the Window object.
-    ''' </summary>
-    Private Function GetWindowIdentification(ByVal hwnd As Integer) As ApiWindow
-
-        Const WM_GETTEXT As Int32 = &HD
-        Const WM_GETTEXTLENGTH As Int32 = &HE
-
-        Dim window As New ApiWindow()
-
-        Dim title As New StringBuilder()
-
-        ' Get the size of the string required to hold the window title.
-        Dim size As Int32 = SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0)
-
-        ' If the return is 0, there is no title.
-        If size > 0 Then
-            title = New StringBuilder(size + 1)
-
-            SendMessage(hwnd, WM_GETTEXT, title.Capacity, title)
-        End If
-
-        ' Get the class name for the window.
-        Dim classBuilder As New StringBuilder(64)
-        GetClassName(hwnd, classBuilder, 64)
-
-        ' Set the properties for the ApiWindow object.
-        window.ClassName = classBuilder.ToString()
-        window.MainWindowTitle = title.ToString()
-        window.hWnd = hwnd
-
-        Return window
-
-    End Function
-End Class

Global_Indexer/Global_Indexer.vbproj

@@ -69,85 +69,91 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.DataAccess.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataAccess.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Pdf.v19.2.Drawing, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v21.2.Drawing, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Spreadsheet.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataVisualization.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Spreadsheet.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraCharts.v19.2.Wizard, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraCharts.v21.2.Wizard, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.Images.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Images.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -160,9 +166,16 @@
     <Reference Include="DigitalData.GUIs.GlobalIndexer">
       <HintPath>..\..\DDMonorepo\GUIs.GlobalIndexer\bin\Debug\DigitalData.GUIs.GlobalIndexer.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Filesystem, Version=1.0.1.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
@@ -171,6 +184,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.License">
+      <HintPath>..\..\DDMonorepo\Modules.License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
@@ -181,14 +197,9 @@
     <Reference Include="DigitalData.Modules.Windows">
       <HintPath>..\..\DDMonorepo\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Windream, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DigitalData.Modules.Windream">
       <HintPath>..\..\DDMonorepo\Modules.Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
-    <Reference Include="DLLLicenseManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
-    </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -203,7 +214,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
@@ -245,37 +256,27 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutBox1.Designer.vb">
-      <DependentUpon>AboutBox1.vb</DependentUpon>
+    <Compile Include="frmAbout.Designer.vb">
+      <DependentUpon>frmAbout.vb</DependentUpon>
     </Compile>
-    <Compile Include="AboutBox1.vb">
+    <Compile Include="frmAbout.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
-    <Compile Include="ClassControls.vb" />
-    <Compile Include="ClassDatabase.vb" />
     <Compile Include="ClassDatatables.vb" />
     <Compile Include="ClassDragDrop.vb" />
-    <Compile Include="ClassFileDrop.vb" />
-    <Compile Include="ClassEmail.vb" />
     <Compile Include="ClassEncryption.vb" />
-    <Compile Include="ClassFilehandle.vb" />
+    <Compile Include="ClassFileHandler.vb" />
     <Compile Include="ClassFolderWatcher.vb" />
-    <Compile Include="ClassFormFunctions.vb" />
-    <Compile Include="ClassHelper.vb" />
     <Compile Include="ClassIDBData.vb" />
     <Compile Include="ClassIndexFunctions.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLayout.vb" />
     <Compile Include="ClassLicence.vb" />
-    <Compile Include="ClassLogger.vb" />
     <Compile Include="ClassParamRefresh.vb" />
     <Compile Include="ClassPatterns.vb" />
     <Compile Include="ClassPostprocessing.vb" />
-    <Compile Include="ClassWindowAPI.vb" />
-    <Compile Include="ClassEmailHeaderExtractor.vb" />
-    <Compile Include="clsHotkey.vb" />
     <Compile Include="frmAdministration.Designer.vb">
       <DependentUpon>frmAdministration.vb</DependentUpon>
     </Compile>
@@ -385,7 +386,6 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="ModuleCURRENT.vb" />
-    <Compile Include="ModuleHelpers.vb" />
     <Compile Include="ModuleRuntime.vb" />
     <Compile Include="ModuleUserSavings.vb" />
     <Compile Include="ModuleWindowHandles.vb" />
@@ -424,8 +424,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="AboutBox1.resx">
-      <DependentUpon>AboutBox1.vb</DependentUpon>
+    <EmbeddedResource Include="frmAbout.resx">
+      <DependentUpon>frmAbout.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAdministration.en-US.resx">
       <DependentUpon>frmAdministration.vb</DependentUpon>
@@ -780,6 +780,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Resources\DD_Icons_ICO_GLOBIX_1.ico" />
+    <Content Include="Changelog.txt" />
     <None Include="Resources\itemtypechecked.svg" />
     <None Include="Resources\trackingchanges_next.svg" />
     <None Include="Resources\GLOBIX_short.png" />

Global_Indexer/ModuleCURRENT.vb

@@ -4,90 +4,84 @@ Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Messaging
 
 Module ModuleCURRENT
-    Public ERROR_STATE As String
-    Public START_INCOMPLETE As Boolean = False
-    Public CURRENT_FILENAME As String
-    Public CURRENT_NEWFILENAME As String
-    Public CURRENT_WORKFILE_GUID As Integer
-    Public CURRENT_WORKFILE_HASH As String
-    Public CURRENT_WORKFILE As String
-    Public CURR_WORKFILE_EXTENSION As String
+    Public Property ERROR_STATE As String
+    Public Property START_INCOMPLETE As Boolean = False
+    Public Property CURRENT_FILENAME As String
+    Public Property CURRENT_NEWFILENAME As String
+    Public Property CURRENT_WORKFILE_GUID As Integer
+    Public Property CURRENT_WORKFILE_HASH As String
+    Public Property CURRENT_WORKFILE As String
+    Public Property CURR_WORKFILE_EXTENSION As String
 
-    Public CONFIG As ConfigManager(Of ClassConfig)
-    Public LOGCONFIG As LogConfig
-    Public LOGGER As Logger
-    Public FILESYSTEM As File
-    Public EMAIL As Email2
+    Public Property CONFIG As ConfigManager(Of ClassConfig)
+    Public Property LOGCONFIG As LogConfig
+    Public Property LOGGER As Logger
+    Public Property FILESYSTEM As File
+    Public Property EMAIL As Email2
 
-    Public CURRENT_DOKART_ID As Integer
-    Public CURRENT_DOKART_DUPLICATE_HANDLING As String = "Default"
-    Public CURRENT_LASTDOKART As String = ""
-    Public CURRENT_INDEXMAN As Integer
-    Public CURRENT_INDEXAUTO As Integer
-    Public CURRENT_SQL_CONFIG As String
+    Public Property FILE_HANDLER As ClassFileHandler
+    Public Property FOLDER_WATCHER As ClassFolderWatcher
 
-    Public VERSION_DELIMITER As String
-    Public FILE_DELIMITER As String
-    Public CURRENT_MESSAGEID As String
-    Public CURRENT_MESSAGEDATE As String
-    Public CURRENT_MESSAGESUBJECT As String
-    Public CURRENT_ISATTACHMENT As Boolean = False
+    Public Property CURRENT_DOKART_ID As Integer
+    Public Property CURRENT_DOKART_DUPLICATE_HANDLING As String = "Default"
+    Public Property CURRENT_LASTDOKART As String = ""
+    Public Property CURRENT_INDEXMAN As Integer
+    Public Property CURRENT_INDEXAUTO As Integer
 
-    Public USER_ID
-    Public USER_IN_MODULE As Boolean = False
-    Public USER_IS_ADMIN As Boolean = False
+    Public Property VERSION_DELIMITER As String
+    Public Property FILE_DELIMITER As String
+    Public Property CURRENT_MESSAGEID As String
+    Public Property CURRENT_MESSAGEDATE As String
+    Public Property CURRENT_MESSAGESUBJECT As String
+    Public Property CURRENT_ISATTACHMENT As Boolean = False
 
-    Public USER_SHORTNAME As String = ""
-    Public USER_PRENAME As String = ""
-    Public USER_SURNAME As String = ""
-    Public USER_EMAIL As String = ""
-    Public USER_LANGUAGE As String = "DE"
-    Public USER_USERNAME As String = ""
-    Public USERCOUNT_LOGGED_IN As Integer = 0
+    Public Property USER_ID
+    Public Property USER_IN_MODULE As Boolean = False
+    Public Property USER_IS_ADMIN As Boolean = False
 
-    Public CURRENT_FOLDERWATCH As String = ""
-    Public CURRENT_SCAN_FOLDERWATCH As String = ""
+    Public Property USER_SHORTNAME As String = ""
+    Public Property USER_PRENAME As String = ""
+    Public Property USER_SURNAME As String = ""
+    Public Property USER_EMAIL As String = ""
+    Public Property USER_LANGUAGE As String = "DE"
+    Public Property USER_USERNAME As String = ""
+    Public Property USERCOUNT_LOGGED_IN As Integer = 0
 
-    Public FWFunction_STARTED As Boolean = False
+    Public Property CURRENT_FOLDERWATCH As String = ""
+    Public Property CURRENT_SCAN_FOLDERWATCH As String = ""
 
-    Public CURR_DOKART_WD_DIRECT As Boolean = False
-    Public CURR_DOKART_OBJECTTYPE As String
-    Public CURRENT_WD_TEMPSEARCH As String = ""
+    Public Property FWFunction_STARTED As Boolean = False
 
-    Public LICENSE_EXPIRED As Boolean = False
-    Public LICENSE_COUNT As Integer = 0
-    Public LICENSE_DOCTYPE_COUNT As Integer = 0
-    Public DOCTYPE_COUNT_ACTUAL As Integer = 0
-    Public LicenseHotKey As Integer = 0
+    Public Property CURR_DOKART_WD_DIRECT As Boolean = False
+    Public Property CURR_DOKART_OBJECTTYPE As String
 
-    Public CURRENT_HTML_DOC As String
+    Public Property LICENSE_EXPIRED As Boolean = False
+    Public Property LICENSE_COUNT As Integer = 0
+    Public Property LICENSE_DOCTYPE_COUNT As Integer = 0
+    Public Property DOCTYPE_COUNT_ACTUAL As Integer = 0
+    Public Property LicenseHotKey As Integer = 0
 
-    Public INDEXING_ACTIVE As Boolean = False
-    Public MULTIINDEXING_ACTIVE As Boolean = False
-    Public ABORT_INDEXING As Boolean = False
+    Public Property INDEXING_ACTIVE As Boolean = False
+    Public Property MULTIINDEXING_ACTIVE As Boolean = False
+    Public Property ABORT_INDEXING As Boolean = False
 
-    Public DTACTUAL_FILES As DataTable
-    Public DTEXCLUDE_FILES As DataTable
-    Public DTTBGI_REGEX_DOCTYPE As DataTable
+    Public Property DTACTUAL_FILES As DataTable
+    Public Property DTEXCLUDE_FILES As DataTable
+    Public Property DTTBGI_REGEX_DOCTYPE As DataTable
 
-    Public CURRENT_SQLRESULT As String
-    Public DTSQL_RESULT As DataTable
-    Public TEMP_FILES As List(Of String) = New List(Of String)
+    Public Property CURRENT_SQLRESULT As String
+    Public Property DTSQL_RESULT As DataTable
 
-    Public CURRENT_FOCUSES_WINDOWNAME As String
+    Public Property LANGUAGE_CHANGED As Boolean = False
+    Public Property CURR_MISSING_PATTERN_NAME As String
+    Public Property CURR_MISSING_SEARCH_STRING As String
+    Public Property CURR_MISSING_MANUAL_VALUE As String
+    Public Property CURR_DELETE_ORIGIN As Boolean = False
+    Public Property CURRENT_DT_REGEX As DataTable
+    Public Property REGEX_CLEAN_FILENAME As String = "[?*^""<>|]"
+    Public Property CURRENT_DROPTYPE
 
-    Public LANGUAGE_CHANGED As Boolean = False
-    Public CURR_MISSING_PATTERN_NAME As String
-    Public CURR_MISSING_SEARCH_STRING As String
-    Public CURR_MISSING_MANUAL_VALUE As String
-    Public CURR_DELETE_ORIGIN As Boolean = False
-    Public CURRENT_DT_REGEX As DataTable
-    Public REGEX_CLEAN_FILENAME As String = "[?*^""<>|]"
-    Public CURRENT_DROPTYPE
-
-    Public VIEWER_LICENSE As String = ""
-
-    Public INDEX_FORM_LOADED As Boolean
+    Public Property VIEWER_LICENSE As String = ""
 End Module
 
 

Global_Indexer/ModuleHelpers.vb

@@ -1,15 +0,0 @@
-Module ModuleHelpers
-    ''' <summary>
-    ''' Überprüft einen Wert auf verschiedene Arten von "Null" und gibt einen Standard-Wert zurück, wenn der Wert "Null" ist.
-    ''' </summary>
-    ''' <param name="value">Der zu überprüfende Wert</param>
-    ''' <param name="defaultValue">Der Standard Wert</param>
-    ''' <returns>value oder wenn dieser "Null" ist, defaultValue</returns>
-    Public Function NotNull(Of T)(ByVal value As T, ByVal defaultValue As T) As T
-        If IsNothing(value) OrElse String.IsNullOrEmpty(value.ToString) OrElse IsDBNull(value) Then
-            Return defaultValue
-        Else
-            Return value
-        End If
-    End Function
-End Module

Global_Indexer/ModuleRuntime.vb

@@ -1,20 +1,22 @@
 Imports System.IO
 Imports System.Xml
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Windream
 Module ModuleRuntime
     'Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml")
     Public Const USER_CONFIG_FILE = "UserConfig.xml"
     Public Const COMPUTER_CONFIG_FILE = "ComputerConfig.xml"
+    Public Const WINDREAM_BASEPATH = "\\windream\objects"
 
     Public MyConnectionString As String = ""
     Public LogErrorsOnly As Boolean = True
     Public GI_withWindream As Boolean = False
     Public WMDrive As String = "W"
     'Public myPreviewActive As Boolean = True
-    Public FW_started As Boolean = False
+    Public Property FW_started As Boolean = False
     Public IDB_ACTIVE As Boolean = False
     Public WORKING_MODE As String
-    Public CONNECTION_STRING_IDB As String
+    Public Property CONNECTION_STRING_IDB As String
 
     Public IDBData As ClassIDBData
     Public IDB_USES_WMFILESTORE As Boolean = False
@@ -23,5 +25,8 @@ Module ModuleRuntime
     Public IDB_DOC_ID As Int64
     Public IDB_LOG_INDEX As String
 
-    Public WINDREAM As Windream
+    Public Property WINDREAM As Windream
+
+    Public Property DATABASE_ECM As MSSQLServer
+    Public Property DATABASE_IDB As MSSQLServer
 End Module

Global_Indexer/My Project/AssemblyInfo.vb

@@ -14,8 +14,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("Global Indexer")>
-<Assembly: AssemblyCopyright("Copyright © 2021")>
-<Assembly: AssemblyTrademark("2420")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyTrademark("2.5.0.10")>
 
 <Assembly: ComVisible(False)> 
 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.2.6")>
+<Assembly: AssemblyVersion("2.5.0.10")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/My Project/Resources.resx

@@ -194,7 +194,7 @@
     <value>..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_next" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_next.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\trackingchanges_next.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="refresh_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -290,6 +290,6 @@
     <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Global_Indexer/My Project/licenses.licx

@@ -1,9 +1,5 @@
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Global_Indexer/My Project/licenses.licx.bak

@@ -1,4 +0,0 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Global_Indexer/clsHotkey.vb

@@ -1,127 +0,0 @@
-Public Class clsHotkey
-    Implements IMessageFilter
-
-    Private Declare Function RegisterHotKey Lib "user32" ( _
-        ByVal Hwnd As IntPtr, _
-        ByVal ID As Integer, _
-        ByVal Modifiers As Integer, _
-        ByVal Key As Integer) _
-    As Integer
-
-    Private Declare Function UnregisterHotKey Lib "user32" ( _
-        ByVal Hwnd As IntPtr, _
-        ByVal ID As Integer) _
-    As Integer
-
-    Private Declare Function GlobalAddAtom Lib "kernel32" Alias "GlobalAddAtomA" ( _
-        ByVal IDString As String) _
-    As Short
-
-    Private Declare Function GlobalDeleteAtom Lib "kernel32" ( _
-        ByVal Atom As Short) _
-    As Short
-
-    Public Class HotKeyObject
-        Private mHotKey As Keys
-        Private mModifier As MODKEY
-        Private mHotKeyID As String
-        Private mAtomID As Short
-
-        Public Property HotKey() As Keys
-            Get
-                Return mHotKey
-            End Get
-            Set(ByVal value As Keys)
-                mHotKey = value
-            End Set
-        End Property
-
-        Public Property Modifier() As MODKEY
-            Get
-                Return mModifier
-            End Get
-            Set(ByVal value As MODKEY)
-                mModifier = value
-            End Set
-        End Property
-
-        Public Property HotKeyID() As String
-            Get
-                Return mHotKeyID
-            End Get
-            Set(ByVal value As String)
-                mHotKeyID = value
-            End Set
-        End Property
-
-        Public Property AtomID() As Short
-            Get
-                Return mAtomID
-            End Get
-            Set(ByVal value As Short)
-                mAtomID = value
-            End Set
-        End Property
-
-        Sub New(ByVal NewHotKey As Keys, ByVal NewModifier As MODKEY, ByVal NewHotKeyID As String)
-            mHotKey = NewHotKey
-            mModifier = NewModifier
-            mHotKeyID = NewHotKeyID
-        End Sub
-    End Class
-
-    Private mForm As Form
-    Private Const WM_HOTKEY As Integer = &H312
-    Private mHotKeyList As New System.Collections.Generic.Dictionary(Of Short, HotKeyObject)
-    Private mHotKeyIDList As New System.Collections.Generic.Dictionary(Of String, Short)
-
-    ''' <summary>
-    ''' Diesem Event wird immer die zugewiesene HotKeyID übergeben wenn eine HotKey Kombination gedrückt wurde.
-    ''' </summary>
-    Public Event HotKeyPressed(ByVal HotKeyID As String)
-
-    Public Enum MODKEY As Integer
-        MOD_ALT = 1
-        MOD_CONTROL = 2
-        MOD_SHIFT = 4
-        MOD_WIN = 8
-    End Enum
-
-    Sub New(ByVal OwnerForm As Form)
-        mForm = OwnerForm
-        Application.AddMessageFilter(Me)
-    End Sub
-
-    ''' <summary>
-    ''' Diese Funktion fügt einen Hotkey hinzu und registriert ihn auch sofort
-    ''' </summary>
-    ''' <param name="KeyCode">Den KeyCode für die Taste</param>
-    ''' <param name="Modifiers">Die Zusatztasten wie z.B. Strg oder Alt, diese können auch mit OR kombiniert werden</param>
-    ''' <param name="HotKeyID">Die ID die der Hotkey bekommen soll um diesen zu identifizieren</param>
-    Public Sub AddHotKey(ByVal KeyCode As Keys, ByVal Modifiers As MODKEY, ByVal HotKeyID As String)
-        If mHotKeyIDList.ContainsKey(HotKeyID) = True Then Exit Sub
-        Dim ID As Short = GlobalAddAtom(HotKeyID)
-        mHotKeyIDList.Add(HotKeyID, ID)
-        mHotKeyList.Add(ID, New HotKeyObject(KeyCode, Modifiers, HotKeyID))
-        RegisterHotKey(mForm.Handle, ID, mHotKeyList(ID).Modifier, mHotKeyList(ID).HotKey)
-    End Sub
-
-    ''' <summary>
-    ''' Diese Funktion entfernt einen Hotkey und deregistriert ihn auch sofort
-    ''' </summary>
-    ''' <param name="HotKeyID">Gibt die HotkeyID an welche entfernt werden soll</param>
-    Public Sub RemoveHotKey(ByVal HotKeyID As String)
-        If mHotKeyIDList.ContainsKey(HotKeyID) = False Then Exit Sub
-        Dim ID As Short = mHotKeyIDList(HotKeyID)
-        mHotKeyIDList.Remove(HotKeyID)
-        mHotKeyList.Remove(ID)
-        UnregisterHotKey(mForm.Handle, CInt(ID))
-        GlobalDeleteAtom(ID)
-    End Sub
-
-    Private Function PreFilterMessage(ByRef m As System.Windows.Forms.Message) As Boolean Implements System.Windows.Forms.IMessageFilter.PreFilterMessage
-        If m.Msg = WM_HOTKEY Then
-            RaiseEvent HotKeyPressed(mHotKeyList(CShort(m.WParam)).HotKeyID)
-        End If
-    End Function
-End Class

Global_Indexer/frmAbout.Designer.vb

@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class AboutBox1
+Partial Class frmAbout
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.

Global_Indexer/frmAbout.vb

@@ -1,4 +1,4 @@
-Public NotInheritable Class AboutBox1
+Public NotInheritable Class frmAbout
 
     Private Sub AboutBox1_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
         ' Legen Sie den Titel des Formulars fest.

Global_Indexer/frmAdministration.Designer.vb

@@ -139,10 +139,10 @@ Partial Class frmAdministration
         Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.Label35 = New System.Windows.Forms.Label()
         Me.SplitContainerControl4 = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.GridControlProfile = New DevExpress.XtraGrid.GridControl()
         Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.MyDataset = New Global_Indexer.MyDataset()
-        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.GridViewProfile = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colAKTIV = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.Label3 = New System.Windows.Forms.Label()
@@ -371,10 +371,10 @@ Partial Class frmAdministration
         CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl4.SuspendLayout()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
         Me.XtraTabPageProfiles.SuspendLayout()
@@ -974,28 +974,28 @@ Partial Class frmAdministration
         '
         resources.ApplyResources(Me.SplitContainerControl4, "SplitContainerControl4")
         Me.SplitContainerControl4.Name = "SplitContainerControl4"
-        Me.SplitContainerControl4.Panel1.Controls.Add(Me.GridControl1)
+        Me.SplitContainerControl4.Panel1.Controls.Add(Me.GridControlProfile)
         Me.SplitContainerControl4.Panel1.Controls.Add(Me.Label3)
         resources.ApplyResources(Me.SplitContainerControl4.Panel1, "SplitContainerControl4.Panel1")
         Me.SplitContainerControl4.Panel2.Controls.Add(Me.XtraTabControl1)
         resources.ApplyResources(Me.SplitContainerControl4.Panel2, "SplitContainerControl4.Panel2")
         Me.SplitContainerControl4.SplitterPosition = 224
         '
-        'GridControl1
+        'GridControlProfile
         '
-        Me.GridControl1.CausesValidation = False
-        Me.GridControl1.DataSource = Me.TBDD_DOKUMENTARTBindingSource
-        resources.ApplyResources(Me.GridControl1, "GridControl1")
-        Me.GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControl1.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControl1.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControl1.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControl1.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControl1.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl1.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControl1.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControl1.MainView = Me.GridView1
-        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.ShowOnlyPredefinedDetails = True
-        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        Me.GridControlProfile.CausesValidation = False
+        Me.GridControlProfile.DataSource = Me.TBDD_DOKUMENTARTBindingSource
+        resources.ApplyResources(Me.GridControlProfile, "GridControlProfile")
+        Me.GridControlProfile.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
+        Me.GridControlProfile.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
+        Me.GridControlProfile.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControl1.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
+        Me.GridControlProfile.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
+        Me.GridControlProfile.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl1.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
+        Me.GridControlProfile.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
+        Me.GridControlProfile.MainView = Me.GridViewProfile
+        Me.GridControlProfile.Name = "GridControlProfile"
+        Me.GridControlProfile.ShowOnlyPredefinedDetails = True
+        Me.GridControlProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile})
         '
         'TBDD_DOKUMENTARTBindingSource
         '
@@ -1007,24 +1007,24 @@ Partial Class frmAdministration
         Me.MyDataset.DataSetName = "MyDataset"
         Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
         '
-        'GridView1
+        'GridViewProfile
         '
-        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise
-        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Khaki
-        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colAKTIV, Me.colBEZEICHNUNG})
-        Me.GridView1.GridControl = Me.GridControl1
-        Me.GridView1.Name = "GridView1"
-        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView1.OptionsBehavior.Editable = False
-        Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
-        Me.GridView1.OptionsView.ShowAutoFilterRow = True
-        Me.GridView1.OptionsView.ShowColumnHeaders = False
-        Me.GridView1.OptionsView.ShowGroupPanel = False
+        Me.GridViewProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise
+        Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Khaki
+        Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True
+        Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colAKTIV, Me.colBEZEICHNUNG})
+        Me.GridViewProfile.GridControl = Me.GridControlProfile
+        Me.GridViewProfile.Name = "GridViewProfile"
+        Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsBehavior.Editable = False
+        Me.GridViewProfile.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewProfile.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewProfile.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewProfile.OptionsView.ShowColumnHeaders = False
+        Me.GridViewProfile.OptionsView.ShowGroupPanel = False
         '
         'colAKTIV
         '
@@ -2493,10 +2493,10 @@ Partial Class frmAdministration
         CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerControl4.ResumeLayout(False)
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl1.ResumeLayout(False)
         Me.XtraTabPageProfiles.ResumeLayout(False)
@@ -2660,8 +2660,8 @@ Partial Class frmAdministration
     Friend WithEvents VARIANTComboBox As System.Windows.Forms.ComboBox
     Friend WithEvents btnAddWindowsVariable As System.Windows.Forms.Button
     Friend WithEvents lblWDINDEX As System.Windows.Forms.Label
-    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
-    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents GridControlProfile As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewProfile As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents colBEZEICHNUNG As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents gridAssignedGroups As DevExpress.XtraGrid.GridControl
     Friend WithEvents viewAssignedGroups As DevExpress.XtraGrid.Views.Grid.GridView

Global_Indexer/frmAdministration.en-US.resx

@@ -121,8 +121,8 @@
   <data name="gridAssignedUsers.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 13</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -146,7 +146,7 @@
         NEwxNiwyOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -167,7 +167,7 @@
         MC45LDIsMkMyNiwxOS4xLDI1LjEsMjAsMjQsMjB6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -191,7 +191,7 @@
   <data name="BarButtonItem3.Caption" xml:space="preserve">
     <value>add</value>
   </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -209,7 +209,7 @@
         Cjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -231,7 +231,7 @@
   <data name="BarButtonItem5.Caption" xml:space="preserve">
     <value>save</value>
   </data>
-  <data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -250,7 +250,7 @@
   <data name="BarButtonItem7.Caption" xml:space="preserve">
     <value>refresh</value>
   </data>
-  <data name="BarButtonItem7.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem7.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -271,7 +271,7 @@
         bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem8.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem8.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -290,7 +290,7 @@
         LjUsMSwxLDFoNVYyMnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="txtStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="txtStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -311,7 +311,7 @@
         PC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="BarButtonItem15.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem15.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -331,7 +331,7 @@
         c3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="BarButtonItem13.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem13.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -347,7 +347,7 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem14.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem14.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -369,7 +369,7 @@
   <data name="BarButtonItem16.Caption" xml:space="preserve">
     <value>add</value>
   </data>
-  <data name="BarButtonItem16.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem16.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -390,7 +390,7 @@
   <data name="BarButtonItem17.Caption" xml:space="preserve">
     <value>save</value>
   </data>
-  <data name="BarButtonItem17.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem17.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -409,7 +409,7 @@
   <data name="BarButtonItem18.Caption" xml:space="preserve">
     <value>refresh</value>
   </data>
-  <data name="BarButtonItem18.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem18.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -430,7 +430,7 @@
         bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem19.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem19.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -449,7 +449,7 @@
         YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem20.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem20.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -467,7 +467,7 @@
         Cjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem21.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem21.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -483,7 +483,7 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem22.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem22.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -504,7 +504,7 @@
         bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem23.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem23.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -523,7 +523,7 @@
         YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem24.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem24.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -541,7 +541,7 @@
         Cjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem25.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem25.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -557,7 +557,7 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem26.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem26.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -578,7 +578,7 @@
         bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem27.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem27.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -597,7 +597,7 @@
         YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem28.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem28.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -615,7 +615,7 @@
         Cjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem29.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem29.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -753,7 +753,7 @@
   <data name="ListBoxControl3.Size" type="System.Drawing.Size, System.Drawing">
     <value>150, 258</value>
   </data>
-  <data name="XtraTabPageManualIndex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageManualIndex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -776,7 +776,7 @@
   <data name="XtraTabControl2.Size" type="System.Drawing.Size, System.Drawing">
     <value>1074, 286</value>
   </data>
-  <data name="XtraTabPageManualIndexFunctions.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageManualIndexFunctions.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -885,7 +885,7 @@ The received values can be written to Indicies or used to rename a file.</value>
   <data name="CHANGED_WHENLabel3.Text" xml:space="preserve">
     <value>Changed when:</value>
   </data>
-  <data name="XtraTabPageAutoIndex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageAutoIndex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -909,7 +909,7 @@ The received values can be written to Indicies or used to rename a file.</value>
   <data name="XtraTabPageAutoIndex.Size" type="System.Drawing.Size, System.Drawing">
     <value>1072, 258</value>
   </data>
-  <data name="XtraTabPageFolderPath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageFolderPath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -938,7 +938,7 @@ The received values can be written to Indicies or used to rename a file.</value>
   <data name="XtraTabPageFolderPath.Size" type="System.Drawing.Size, System.Drawing">
     <value>1072, 258</value>
   </data>
-  <data name="XtraTabPageProfileRegex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageProfileRegex.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1039,7 +1039,7 @@ The received values can be written to Indicies or used to rename a file.</value>
   <data name="GEAENDERTWANNLabel.Text" xml:space="preserve">
     <value>Changed when:</value>
   </data>
-  <data name="XtraTabPageProfiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageProfiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1063,7 +1063,7 @@ The received values can be written to Indicies or used to rename a file.</value>
         LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="tabPageUsers.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tabPageUsers.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1087,7 +1087,7 @@ The received values can be written to Indicies or used to rename a file.</value>
         MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="tabPageGroups.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tabPageGroups.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1111,7 +1111,7 @@ The received values can be written to Indicies or used to rename a file.</value>
         MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="XtraTabPageUsersGroups.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="XtraTabPageUsersGroups.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

Global_Indexer/frmAdministration.vb

@@ -106,7 +106,7 @@ Public Class frmAdministration
             Me.TBDD_DOKUMENTARTTableAdapter.FillByModuleGI(Me.MyDataset.TBDD_DOKUMENTART)
 
             If MyDataset.TBDD_DOKUMENTART.Rows.Count > 0 Then
-                GridView1.SelectRow(1)
+                GridViewProfile.SelectRow(1)
                 EnableControls(XtraTabPageProfiles)
             End If
             If Me.DOKART_GUIDTextBox.Text <> "" Then
@@ -144,7 +144,7 @@ Public Class frmAdministration
                 RibbonPageGroupAutoIndex.Enabled = True
             Case XtraTabPageFolderPath.Name
                 Try
-                    Dim Dt As DataTable = ClassDatabase.Return_Datatable("select NAME from VWDDINDICES_MAN_AUTO_ACTIVE where DOCTYPE_ID = " & DOKART_GUIDTextBox.Text & " order by NAME")
+                    Dim Dt As DataTable = DATABASE_ECM.GetDatatable("select NAME from VWDDINDICES_MAN_AUTO_ACTIVE where DOCTYPE_ID = " & DOKART_GUIDTextBox.Text & " order by NAME")
                     cmbCrFolderIndex.DataSource = Dt
                     cmbCrFolderIndex.DisplayMember = Dt.Columns(0).ColumnName
                 Catch ex As Exception
@@ -210,10 +210,10 @@ Public Class frmAdministration
 
                 If IsInsert = True Then
                     Dim oNewID As Integer
-                    oNewID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART", MyConnectionString)
+                    oNewID = DATABASE_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_DOKUMENTART")
                     If IsNumeric(oNewID) Then
                         Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}"
-                        If ClassDatabase.Execute_non_Query(osql) = False Then
+                        If DATABASE_ECM.ExecuteNonQuery(osql) = False Then
                             MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text)
                         End If
                     End If
@@ -270,7 +270,7 @@ Public Class frmAdministration
         Save_Dokumentart()
         Try
             Dim sql = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1"
-            Dim DoctypeCount = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+            Dim DoctypeCount = DATABASE_ECM.GetScalarValue(sql)
             If DoctypeCount = LICENSE_DOCTYPE_COUNT Then
                 If USER_LANGUAGE = "de-DE" Then
                     MsgBox("Ihre Anzahl von konfigurierbaren Dokuemntarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'. Sie können nun keine Dokumentart hinzufügen!" & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information)
@@ -300,7 +300,7 @@ Public Class frmAdministration
     End Sub
     Private Sub btnadd_Click(sender As Object, e As EventArgs)
         Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{DOKART_GUIDTextBox.Text}"
-        ClassDatabase.Execute_non_Query(osql)
+        DATABASE_ECM.ExecuteNonQuery(osql)
         LoadGlobix_Doctypes()
     End Sub
 
@@ -757,7 +757,9 @@ Public Class frmAdministration
     End Sub
 
     Sub LoadGlobix_Doctypes()
+        Dim oFocusedRow = GridViewProfile.FocusedRowHandle
         Load_Dokart()
+        GridViewProfile.FocusedRowHandle = oFocusedRow
     End Sub
 
     Private Sub btncrFolder_delete_Click(sender As Object, e As EventArgs) Handles btncrFolder_delete.Click
@@ -846,9 +848,9 @@ Public Class frmAdministration
         If GUIDTextBox1.Text <> "" Then
             Try
                 Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & GUIDTextBox1.Text
-                If ClassDatabase.Execute_non_Query(del) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                     del = "DELETE FROM TBDD_INDEX_MAN WHERE GUID = " & GUIDTextBox1.Text
-                    If ClassDatabase.Execute_non_Query(del) = True Then
+                    If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                         Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
                     End If
                 End If
@@ -959,7 +961,7 @@ Public Class frmAdministration
         If result = MsgBoxResult.Yes Then
             Try
                 Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text
-                If ClassDatabase.Execute_non_Query(del, True) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                     Load_Dokart()
                     TBDD_DOKUMENTARTBindingSource.ResetBindings(True)
 
@@ -986,9 +988,9 @@ Public Class frmAdministration
 
         If result = MsgBoxResult.Yes Then
             Try
-                Dim oGlobixId = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'", MyConnectionString)
+                Dim oGlobixId = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'")
                 Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oGlobixId
-                If ClassDatabase.Execute_non_Query(copy, True) Then
+                If DATABASE_ECM.ExecuteNonQuery(copy) Then
 
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Das Profil wurde erfolgreich kopiert und auf INAKTIV gesetzt." & vbNewLine & "Bitte beachten Sie:" & vbNewLine & "- Das Profil wurde keiner Usergruppe zugeordnet.", MsgBoxStyle.Information)
@@ -1041,7 +1043,7 @@ Public Class frmAdministration
     Private Sub ToolStripButton9_Click(sender As Object, e As EventArgs)
         Try
             Dim oSQL = $"DELETE FROM TBGI_REGEX_DOCTYPE WHERE GUID = {TextBox3.Text}"
-            If ClassDatabase.Execute_non_Query(oSQL, True) = True Then
+            If DATABASE_ECM.ExecuteNonQuery(oSQL) = True Then
                 Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text)
             End If
         Catch ex As Exception
@@ -1060,7 +1062,7 @@ Public Class frmAdministration
     Private Sub BarButtonItem14_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem14.ItemClick
         Try
             Dim oSQL = $"DELETE FROM TBGI_REGEX_DOCTYPE WHERE DOCTYPE_ID = {DOKART_GUIDTextBox.Text}"
-            ClassDatabase.Execute_non_Query(oSQL)
+            DATABASE_ECM.ExecuteNonQuery(oSQL)
             TBGI_REGEX_DOCTYPETableAdapter.Fill(MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text)
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -1069,11 +1071,15 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick
-        TBDD_INDEX_MANBindingSource.AddNew()
+        Try
+            TBDD_INDEX_MANBindingSource.AddNew()
 
-        If WINDREAM_DIRECTCheckBox.Checked = True Then
-            load_WDIndices()
-        End If
+            If WINDREAM_DIRECTCheckBox.Checked = True Then
+                load_WDIndices()
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
     End Sub
 
     Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick
@@ -1093,9 +1099,9 @@ Public Class frmAdministration
             If GUIDTextBox1.Text <> "" Then
                 Try
                     Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & GUIDTextBox1.Text
-                    If ClassDatabase.Execute_non_Query(del) = True Then
+                    If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                         del = "DELETE FROM TBDD_INDEX_MAN WHERE GUID = " & GUIDTextBox1.Text
-                        If ClassDatabase.Execute_non_Query(del) = True Then
+                        If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                             Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
                         End If
                     End If
@@ -1108,12 +1114,18 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem18_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem18.ItemClick
         If DOKART_GUIDTextBox.Text <> String.Empty Then
+            Dim oSelectedIndex = ListBoxControl3.SelectedIndex
             Load_INDEXMAN(DOKART_GUIDTextBox.Text)
+            ListBoxControl3.SelectedIndex = oSelectedIndex
         End If
     End Sub
 
     Private Sub BarButtonItem20_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem20.ItemClick
-        TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.AddNew()
+        Try
+            TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.AddNew()
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
     End Sub
 
     Private Sub BarButtonItem21_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem21.ItemClick
@@ -1133,7 +1145,7 @@ Public Class frmAdministration
             If GUIDTextBox1.Text <> "" Then
                 Try
                     Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE GUID = " & GUIDTextBox4.Text
-                    If ClassDatabase.Execute_non_Query(del) = True Then
+                    If DATABASE_ECM.ExecuteNonQuery(del) = True Then
                         Load_PostProcessing(Me.DOKART_GUIDTextBox.Text)
                     End If
                 Catch ex As Exception
@@ -1144,15 +1156,21 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem22_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem22.ItemClick
+        Dim oSelectedIndex = ListBox1.SelectedIndex
         Load_PostProcessing(Me.DOKART_GUIDTextBox.Text)
+        ListBox1.SelectedIndex = oSelectedIndex
     End Sub
 
     Private Sub BarButtonItem24_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem24.ItemClick
-        TBDD_INDEX_AUTOMBindingSource.AddNew()
+        Try
+            TBDD_INDEX_AUTOMBindingSource.AddNew()
 
-        If WINDREAM_DIRECTCheckBox.Checked = True Then
-            load_WDIndices()
-        End If
+            If WINDREAM_DIRECTCheckBox.Checked = True Then
+                load_WDIndices()
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
     End Sub
 
     Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs)
@@ -1171,7 +1189,7 @@ Public Class frmAdministration
         If result = MsgBoxResult.Yes Then
             Try
                 Dim oSQL = $"DELETE FROM TBDD_INDEX_AUTOM WHERE GUID = {GUIDAUTO_INDEXTextbox.Text}"
-                ClassDatabase.Execute_non_Query(oSQL)
+                DATABASE_ECM.ExecuteNonQuery(oSQL)
                 Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text)
             Catch ex As Exception
                 LOGGER.Error(ex)
@@ -1181,7 +1199,9 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem26_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem26.ItemClick
+        Dim oSelectedIndex = ListBoxControl4.SelectedIndex
         Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text)
+        ListBoxControl4.SelectedIndex = oSelectedIndex
     End Sub
 
     Private Sub BarButtonItem25_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem25.ItemClick
@@ -1228,17 +1248,19 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick
-        TBGI_REGEX_DOCTYPEBindingSource.AddNew()
-
-
-        EnableControls(XtraTabPageProfileRegex)
+        Try
+            TBGI_REGEX_DOCTYPEBindingSource.AddNew()
+            EnableControls(XtraTabPageProfileRegex)
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
     End Sub
 
-    Private Sub GridView1_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles GridView1.ValidateRow
+    Private Sub GridView1_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles GridViewProfile.ValidateRow
         e.Valid = True
     End Sub
 
-    Private Sub GridView1_InvalidRowException(sender As Object, e As InvalidRowExceptionEventArgs) Handles GridView1.InvalidRowException
+    Private Sub GridView1_InvalidRowException(sender As Object, e As InvalidRowExceptionEventArgs) Handles GridViewProfile.InvalidRowException
         e.ExceptionMode = DevExpress.XtraEditors.Controls.ExceptionMode.NoAction
     End Sub
 
@@ -1316,8 +1338,8 @@ Public Class frmAdministration
         End If
     End Sub
 
-    Private Sub GridView1_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles GridView1.BeforeLeaveRow
-        Dim oRowView As DataRowView = GridView1.GetRow(e.RowHandle)
+    Private Sub GridView1_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles GridViewProfile.BeforeLeaveRow
+        Dim oRowView As DataRowView = GridViewProfile.GetRow(e.RowHandle)
         Dim oProfileName As String = oRowView?.Row.Item("BEZEICHNUNG")
 
         If oRowView Is Nothing Then

Global_Indexer/frmConfig_Basic.designer.vb

@@ -23,7 +23,7 @@ Partial Class frmConfig_Basic
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
@@ -46,7 +46,6 @@ Partial Class frmConfig_Basic
         Me.CheckBoxPreviewDocs = New System.Windows.Forms.CheckBox()
         Me.CheckBoxIndexResult = New System.Windows.Forms.CheckBox()
         Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox()
-        Me.btnLogMail = New System.Windows.Forms.Button()
         Me.btnApplicationFolder = New System.Windows.Forms.Button()
         Me.btnopenlog = New System.Windows.Forms.Button()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
@@ -177,7 +176,6 @@ Partial Class frmConfig_Basic
         Me.TabPage2.Controls.Add(Me.CheckBoxPreviewDocs)
         Me.TabPage2.Controls.Add(Me.CheckBoxIndexResult)
         Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly)
-        Me.TabPage2.Controls.Add(Me.btnLogMail)
         Me.TabPage2.Controls.Add(Me.btnApplicationFolder)
         Me.TabPage2.Controls.Add(Me.btnopenlog)
         resources.ApplyResources(Me.TabPage2, "TabPage2")
@@ -228,13 +226,6 @@ Partial Class frmConfig_Basic
         Me.chkLogErrorsOnly.Name = "chkLogErrorsOnly"
         Me.chkLogErrorsOnly.UseVisualStyleBackColor = True
         '
-        'btnLogMail
-        '
-        Me.btnLogMail.Image = Global.Global_Indexer.My.Resources.Resources.email
-        resources.ApplyResources(Me.btnLogMail, "btnLogMail")
-        Me.btnLogMail.Name = "btnLogMail"
-        Me.btnLogMail.UseVisualStyleBackColor = True
-        '
         'btnApplicationFolder
         '
         Me.btnApplicationFolder.Image = Global.Global_Indexer.My.Resources.Resources.folder_go
@@ -275,8 +266,8 @@ Partial Class frmConfig_Basic
         '
         'DataGridView1
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         resources.ApplyResources(Me.DataGridView1, "DataGridView1")
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Name = "DataGridView1"
@@ -406,7 +397,6 @@ Partial Class frmConfig_Basic
     Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView
     Friend WithEvents btnSaveExclusionFiles As System.Windows.Forms.Button
     Friend WithEvents Label8 As System.Windows.Forms.Label
-    Friend WithEvents btnLogMail As System.Windows.Forms.Button
     Friend WithEvents cmbLanguage As System.Windows.Forms.ComboBox
     Friend WithEvents Label9 As System.Windows.Forms.Label
     Friend WithEvents Button3 As System.Windows.Forms.Button

Global_Indexer/frmConfig_Basic.resx

@@ -117,23 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="chkbxUserAut.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="chkbxUserAut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 58</value>
-  </data>
-  <data name="chkbxUserAut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 17</value>
-  </data>
-  <data name="chkbxUserAut.TabIndex" type="System.Int32, mscorlib">
-    <value>47</value>
-  </data>
-  <data name="chkbxUserAut.Text" xml:space="preserve">
-    <value>Windows-Authentifizierung</value>
-  </data>
   <data name="&gt;&gt;chkbxUserAut.Name" xml:space="preserve">
     <value>chkbxUserAut</value>
   </data>
@@ -146,21 +129,6 @@
   <data name="&gt;&gt;chkbxUserAut.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 115</value>
-  </data>
-  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 13</value>
-  </data>
-  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
-    <value>46</value>
-  </data>
-  <data name="Label5.Text" xml:space="preserve">
-    <value>Aktueller ConnectionString:</value>
-  </data>
   <data name="&gt;&gt;Label5.Name" xml:space="preserve">
     <value>Label5</value>
   </data>
@@ -173,15 +141,6 @@
   <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="cmbDatenbank.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 78</value>
-  </data>
-  <data name="cmbDatenbank.Size" type="System.Drawing.Size, System.Drawing">
-    <value>244, 21</value>
-  </data>
-  <data name="cmbDatenbank.TabIndex" type="System.Int32, mscorlib">
-    <value>39</value>
-  </data>
   <data name="&gt;&gt;cmbDatenbank.Name" xml:space="preserve">
     <value>cmbDatenbank</value>
   </data>
@@ -194,21 +153,6 @@
   <data name="&gt;&gt;cmbDatenbank.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 62</value>
-  </data>
-  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 13</value>
-  </data>
-  <data name="Label4.TabIndex" type="System.Int32, mscorlib">
-    <value>44</value>
-  </data>
-  <data name="Label4.Text" xml:space="preserve">
-    <value>Datenbank:</value>
-  </data>
   <data name="&gt;&gt;Label4.Name" xml:space="preserve">
     <value>Label4</value>
   </data>
@@ -221,21 +165,6 @@
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 14</value>
-  </data>
-  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 13</value>
-  </data>
-  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
-    <value>41</value>
-  </data>
-  <data name="Label1.Text" xml:space="preserve">
-    <value>Server-Name:</value>
-  </data>
   <data name="&gt;&gt;Label1.Name" xml:space="preserve">
     <value>Label1</value>
   </data>
@@ -248,21 +177,6 @@
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 14</value>
-  </data>
-  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 13</value>
-  </data>
-  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
-    <value>42</value>
-  </data>
-  <data name="Label2.Text" xml:space="preserve">
-    <value>Benutzername:</value>
-  </data>
   <data name="&gt;&gt;Label2.Name" xml:space="preserve">
     <value>Label2</value>
   </data>
@@ -275,21 +189,6 @@
   <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>379, 14</value>
-  </data>
-  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 13</value>
-  </data>
-  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
-    <value>43</value>
-  </data>
-  <data name="Label3.Text" xml:space="preserve">
-    <value>Passwort:</value>
-  </data>
   <data name="&gt;&gt;Label3.Name" xml:space="preserve">
     <value>Label3</value>
   </data>
@@ -302,19 +201,6 @@
   <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtActualConnection.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="txtActualConnection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 131</value>
-  </data>
-  <data name="txtActualConnection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>370, 22</value>
-  </data>
-  <data name="txtActualConnection.TabIndex" type="System.Int32, mscorlib">
-    <value>45</value>
-  </data>
   <data name="&gt;&gt;txtActualConnection.Name" xml:space="preserve">
     <value>txtActualConnection</value>
   </data>
@@ -327,15 +213,6 @@
   <data name="&gt;&gt;txtActualConnection.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
-  <data name="txtServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 30</value>
-  </data>
-  <data name="txtServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>246, 22</value>
-  </data>
-  <data name="txtServer.TabIndex" type="System.Int32, mscorlib">
-    <value>36</value>
-  </data>
   <data name="&gt;&gt;txtServer.Name" xml:space="preserve">
     <value>txtServer</value>
   </data>
@@ -348,15 +225,6 @@
   <data name="&gt;&gt;txtServer.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
-  <data name="txtUser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 30</value>
-  </data>
-  <data name="txtUser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 22</value>
-  </data>
-  <data name="txtUser.TabIndex" type="System.Int32, mscorlib">
-    <value>37</value>
-  </data>
   <data name="&gt;&gt;txtUser.Name" xml:space="preserve">
     <value>txtUser</value>
   </data>
@@ -369,15 +237,6 @@
   <data name="&gt;&gt;txtUser.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="txtPasswort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 30</value>
-  </data>
-  <data name="txtPasswort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 22</value>
-  </data>
-  <data name="txtPasswort.TabIndex" type="System.Int32, mscorlib">
-    <value>38</value>
-  </data>
   <data name="&gt;&gt;txtPasswort.Name" xml:space="preserve">
     <value>txtPasswort</value>
   </data>
@@ -390,24 +249,6 @@
   <data name="&gt;&gt;txtPasswort.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
-  <data name="BtnConnect.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="BtnConnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 75</value>
-  </data>
-  <data name="BtnConnect.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 25</value>
-  </data>
-  <data name="BtnConnect.TabIndex" type="System.Int32, mscorlib">
-    <value>40</value>
-  </data>
-  <data name="BtnConnect.Text" xml:space="preserve">
-    <value>Verbindung zur Datenbank herstellen</value>
-  </data>
-  <data name="BtnConnect.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleRight</value>
-  </data>
   <data name="&gt;&gt;BtnConnect.Name" xml:space="preserve">
     <value>BtnConnect</value>
   </data>
@@ -420,15 +261,18 @@
   <data name="&gt;&gt;BtnConnect.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TabPage1.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 3, 3, 3</value>
   </data>
   <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
     <value>582, 280</value>
   </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
@@ -451,7 +295,7 @@
     <value>True</value>
   </data>
   <data name="LinkLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>224, 178</value>
+    <value>8, 166</value>
   </data>
   <data name="LinkLabel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>153, 13</value>
@@ -634,36 +478,6 @@
   <data name="&gt;&gt;chkLogErrorsOnly.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
-  <data name="btnLogMail.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="btnLogMail.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 171</value>
-  </data>
-  <data name="btnLogMail.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 26</value>
-  </data>
-  <data name="btnLogMail.TabIndex" type="System.Int32, mscorlib">
-    <value>41</value>
-  </data>
-  <data name="btnLogMail.Text" xml:space="preserve">
-    <value>Log/Support Mail erzeugen</value>
-  </data>
-  <data name="btnLogMail.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleRight</value>
-  </data>
-  <data name="&gt;&gt;btnLogMail.Name" xml:space="preserve">
-    <value>btnLogMail</value>
-  </data>
-  <data name="&gt;&gt;btnLogMail.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnLogMail.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;btnLogMail.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
   <data name="btnApplicationFolder.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
@@ -692,7 +506,7 @@
     <value>TabPage2</value>
   </data>
   <data name="&gt;&gt;btnApplicationFolder.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>7</value>
   </data>
   <data name="btnopenlog.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
@@ -725,7 +539,7 @@
     <value>TabPage2</value>
   </data>
   <data name="&gt;&gt;btnopenlog.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</value>
   </data>
   <data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
@@ -754,6 +568,513 @@
   <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="&gt;&gt;Label8.Name" xml:space="preserve">
+    <value>Label8</value>
+  </data>
+  <data name="&gt;&gt;Label8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label8.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;DataGridView1.Name" xml:space="preserve">
+    <value>DataGridView1</value>
+  </data>
+  <data name="&gt;&gt;DataGridView1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DataGridView1.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;DataGridView1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;Button2.Name" xml:space="preserve">
+    <value>Button2</value>
+  </data>
+  <data name="&gt;&gt;Button2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Button2.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;Button2.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;txtScanFolderWatch.Name" xml:space="preserve">
+    <value>txtScanFolderWatch</value>
+  </data>
+  <data name="&gt;&gt;txtScanFolderWatch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtScanFolderWatch.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;txtScanFolderWatch.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;Label7.Name" xml:space="preserve">
+    <value>Label7</value>
+  </data>
+  <data name="&gt;&gt;Label7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label7.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;btnsetFW_Folder.Name" xml:space="preserve">
+    <value>btnsetFW_Folder</value>
+  </data>
+  <data name="&gt;&gt;btnsetFW_Folder.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnsetFW_Folder.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnsetFW_Folder.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;btnFW_OwnFiles.Name" xml:space="preserve">
+    <value>btnFW_OwnFiles</value>
+  </data>
+  <data name="&gt;&gt;btnFW_OwnFiles.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnFW_OwnFiles.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnFW_OwnFiles.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;btnFW_Desktop.Name" xml:space="preserve">
+    <value>btnFW_Desktop</value>
+  </data>
+  <data name="&gt;&gt;btnFW_Desktop.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnFW_Desktop.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnFW_Desktop.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;txtFolderWatch.Name" xml:space="preserve">
+    <value>txtFolderWatch</value>
+  </data>
+  <data name="&gt;&gt;txtFolderWatch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtFolderWatch.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;txtFolderWatch.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;Label6.Name" xml:space="preserve">
+    <value>Label6</value>
+  </data>
+  <data name="&gt;&gt;Label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label6.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;btnSaveExclusionFiles.Name" xml:space="preserve">
+    <value>btnSaveExclusionFiles</value>
+  </data>
+  <data name="&gt;&gt;btnSaveExclusionFiles.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnSaveExclusionFiles.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnSaveExclusionFiles.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop2.Name" xml:space="preserve">
+    <value>btnstartstop2</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop2.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop2.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop1.Name" xml:space="preserve">
+    <value>btnstartstop1</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop1.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;btnstartstop1.ZOrder" xml:space="preserve">
+    <value>12</value>
+  </data>
+  <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TabPage3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>582, 280</value>
+  </data>
+  <data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="TabPage3.Text" xml:space="preserve">
+    <value>Überwachte Ordner - Folderwatch</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Name" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Parent" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>590, 306</value>
+  </data>
+  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="chkbxUserAut.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkbxUserAut.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 58</value>
+  </data>
+  <data name="chkbxUserAut.Size" type="System.Drawing.Size, System.Drawing">
+    <value>170, 17</value>
+  </data>
+  <data name="chkbxUserAut.TabIndex" type="System.Int32, mscorlib">
+    <value>47</value>
+  </data>
+  <data name="chkbxUserAut.Text" xml:space="preserve">
+    <value>Windows-Authentifizierung</value>
+  </data>
+  <data name="&gt;&gt;chkbxUserAut.Name" xml:space="preserve">
+    <value>chkbxUserAut</value>
+  </data>
+  <data name="&gt;&gt;chkbxUserAut.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkbxUserAut.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;chkbxUserAut.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 115</value>
+  </data>
+  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 13</value>
+  </data>
+  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
+    <value>46</value>
+  </data>
+  <data name="Label5.Text" xml:space="preserve">
+    <value>Aktueller ConnectionString:</value>
+  </data>
+  <data name="&gt;&gt;Label5.Name" xml:space="preserve">
+    <value>Label5</value>
+  </data>
+  <data name="&gt;&gt;Label5.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label5.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="cmbDatenbank.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 78</value>
+  </data>
+  <data name="cmbDatenbank.Size" type="System.Drawing.Size, System.Drawing">
+    <value>244, 21</value>
+  </data>
+  <data name="cmbDatenbank.TabIndex" type="System.Int32, mscorlib">
+    <value>39</value>
+  </data>
+  <data name="&gt;&gt;cmbDatenbank.Name" xml:space="preserve">
+    <value>cmbDatenbank</value>
+  </data>
+  <data name="&gt;&gt;cmbDatenbank.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbDatenbank.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;cmbDatenbank.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 62</value>
+  </data>
+  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>67, 13</value>
+  </data>
+  <data name="Label4.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
+  </data>
+  <data name="Label4.Text" xml:space="preserve">
+    <value>Datenbank:</value>
+  </data>
+  <data name="&gt;&gt;Label4.Name" xml:space="preserve">
+    <value>Label4</value>
+  </data>
+  <data name="&gt;&gt;Label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label4.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 14</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>74, 13</value>
+  </data>
+  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>Server-Name:</value>
+  </data>
+  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
+    <value>Label1</value>
+  </data>
+  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 14</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 13</value>
+  </data>
+  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>Benutzername:</value>
+  </data>
+  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
+    <value>Label2</value>
+  </data>
+  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>379, 14</value>
+  </data>
+  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 13</value>
+  </data>
+  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="Label3.Text" xml:space="preserve">
+    <value>Passwort:</value>
+  </data>
+  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
+    <value>Label3</value>
+  </data>
+  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="txtActualConnection.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtActualConnection.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 131</value>
+  </data>
+  <data name="txtActualConnection.Size" type="System.Drawing.Size, System.Drawing">
+    <value>370, 22</value>
+  </data>
+  <data name="txtActualConnection.TabIndex" type="System.Int32, mscorlib">
+    <value>45</value>
+  </data>
+  <data name="&gt;&gt;txtActualConnection.Name" xml:space="preserve">
+    <value>txtActualConnection</value>
+  </data>
+  <data name="&gt;&gt;txtActualConnection.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtActualConnection.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;txtActualConnection.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="txtServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 30</value>
+  </data>
+  <data name="txtServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>246, 22</value>
+  </data>
+  <data name="txtServer.TabIndex" type="System.Int32, mscorlib">
+    <value>36</value>
+  </data>
+  <data name="&gt;&gt;txtServer.Name" xml:space="preserve">
+    <value>txtServer</value>
+  </data>
+  <data name="&gt;&gt;txtServer.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtServer.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;txtServer.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="txtUser.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 30</value>
+  </data>
+  <data name="txtUser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 22</value>
+  </data>
+  <data name="txtUser.TabIndex" type="System.Int32, mscorlib">
+    <value>37</value>
+  </data>
+  <data name="&gt;&gt;txtUser.Name" xml:space="preserve">
+    <value>txtUser</value>
+  </data>
+  <data name="&gt;&gt;txtUser.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtUser.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;txtUser.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="txtPasswort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>382, 30</value>
+  </data>
+  <data name="txtPasswort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 22</value>
+  </data>
+  <data name="txtPasswort.TabIndex" type="System.Int32, mscorlib">
+    <value>38</value>
+  </data>
+  <data name="&gt;&gt;txtPasswort.Name" xml:space="preserve">
+    <value>txtPasswort</value>
+  </data>
+  <data name="&gt;&gt;txtPasswort.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPasswort.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;txtPasswort.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="BtnConnect.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="BtnConnect.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 75</value>
+  </data>
+  <data name="BtnConnect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 25</value>
+  </data>
+  <data name="BtnConnect.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="BtnConnect.Text" xml:space="preserve">
+    <value>Verbindung zur Datenbank herstellen</value>
+  </data>
+  <data name="BtnConnect.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="&gt;&gt;BtnConnect.Name" xml:space="preserve">
+    <value>BtnConnect</value>
+  </data>
+  <data name="&gt;&gt;BtnConnect.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;BtnConnect.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;BtnConnect.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
   <data name="Label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1094,57 +1415,6 @@ ausgenommen werden sollen:</value>
   <data name="&gt;&gt;btnstartstop1.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
-  <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
-  </data>
-  <data name="TabPage3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
-  </data>
-  <data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>582, 280</value>
-  </data>
-  <data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="TabPage3.Text" xml:space="preserve">
-    <value>Überwachte Ordner - Folderwatch</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Name" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>590, 306</value>
-  </data>
-  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

Global_Indexer/frmConfig_Basic.vb

@@ -68,7 +68,7 @@ Public Class frmConfig_Basic
                 sql = sql.Replace("@user", Environment.UserName)
                 LOGGER.Info(">> Username: " & Environment.UserName)
 
-                USER_ID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+                USER_ID = DATABASE_ECM.GetScalarValue(sql)
                 If IsDBNull(USER_ID) Then
                     MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for Global Indexer. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation)
                     LOGGER.Info("User '" & Environment.UserName & "' not configured for Global Indexer! (DBNull - frmConfigBasic)")
@@ -92,11 +92,12 @@ Public Class frmConfig_Basic
                 Exit Sub
             End If
             Me.Cursor = Cursors.WaitCursor
-            Dim csb As New SqlClient.SqlConnectionStringBuilder
-            csb.DataSource = Me.txtServer.Text
-            csb.IntegratedSecurity = False
-            csb.UserID = Me.txtUser.Text
-            csb.Password = Me.txtPasswort.Text
+            Dim csb As New SqlClient.SqlConnectionStringBuilder With {
+                .DataSource = Me.txtServer.Text,
+                .IntegratedSecurity = False,
+                .UserID = Me.txtUser.Text,
+                .Password = Me.txtPasswort.Text
+            }
 
             Dim con As String
             If chkbxUserAut.Checked Then
@@ -106,8 +107,9 @@ Public Class frmConfig_Basic
             End If
             Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString)
             connection.Open()
-            Dim cmd As New SqlClient.SqlCommand("sp_databases", connection)
-            cmd.CommandType = CommandType.StoredProcedure
+            Dim cmd As New SqlClient.SqlCommand("sp_databases", connection) With {
+                .CommandType = CommandType.StoredProcedure
+            }
             ' Ausführen und Ergebnis in einer ListBox anzeigen
             Dim dr As SqlClient.SqlDataReader = cmd.ExecuteReader
             If dr.HasRows Then
@@ -150,20 +152,20 @@ Public Class frmConfig_Basic
                     Exit Sub
                 End If
                 reload = True
-                Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID, MyConnectionString)
-                If Not folderwatch Is Nothing Then
+                Dim folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID)
+                If folderwatch IsNot Nothing Then
                     CURRENT_FOLDERWATCH = folderwatch
                 End If
                 Me.txtFolderWatch.Text = CURRENT_FOLDERWATCH
-                Dim SCAN_folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID, MyConnectionString)
-                If Not SCAN_folderwatch Is Nothing Then
+                Dim SCAN_folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID)
+                If SCAN_folderwatch IsNot Nothing Then
                     CURRENT_SCAN_FOLDERWATCH = SCAN_folderwatch
                 End If
                 Me.txtFolderWatch.Text = CURRENT_FOLDERWATCH
                 Me.txtScanFolderWatch.Text = CURRENT_SCAN_FOLDERWATCH
 
-                If Not ClassFolderWatcher.FolderWatcher Is Nothing Then
-                    If ClassFolderWatcher.FolderWatcher.EnableRaisingEvents = True Then
+                If FOLDER_WATCHER.FolderWatcher IsNot Nothing Then
+                    If FOLDER_WATCHER.FolderWatcher.EnableRaisingEvents = True Then
                         If USER_LANGUAGE = "de-DE" Then
                             btnstartstop1.Text = "Überwachung stoppen"
                         Else
@@ -191,8 +193,8 @@ Public Class frmConfig_Basic
                     btnstartstop1.Image = My.Resources.bell_go
                 End If
 
-                If Not ClassFolderWatcher.FolderWatcher_SCAN Is Nothing Then
-                    If ClassFolderWatcher.FolderWatcher_SCAN.EnableRaisingEvents = True Then
+                If FOLDER_WATCHER.FolderWatcher_SCAN IsNot Nothing Then
+                    If FOLDER_WATCHER.FolderWatcher_SCAN.EnableRaisingEvents = True Then
                         If USER_LANGUAGE = "de-DE" Then
                             btnstartstop2.Text = "Überwachung stoppen"
                         Else
@@ -230,7 +232,7 @@ Public Class frmConfig_Basic
     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 = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", True)
+                DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'")
                 If FOLDER_TYPE = "SCAN" Then
                     CURRENT_SCAN_FOLDERWATCH = ""
                     CONFIG.Config.FolderWatchScanStarted = False
@@ -262,15 +264,15 @@ Public Class frmConfig_Basic
                 Exit Sub
             End Try
 
-            Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", MyConnectionString)
+            Dim folderwatch = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'")
             Dim sql As String
             If folderwatch Is Nothing Then
                 sql = "INSERT INTO TBGI_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE, ADDED_WHO) VALUES (" & USER_ID & ",'" & mypath & "','" & FOLDER_TYPE & "','" & Environment.UserName & "')"
             Else
                 sql = "UPDATE TBGI_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch
             End If
-            If ClassDatabase.Execute_non_Query(sql) Then
-                folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", MyConnectionString)
+            If DATABASE_ECM.ExecuteNonQuery(sql) Then
+                folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'")
 
                 If FOLDER_TYPE = "SCAN" Then
                     CURRENT_SCAN_FOLDERWATCH = folderwatch
@@ -281,10 +283,10 @@ Public Class frmConfig_Basic
                 End If
             End If
             If FW_started = True And FOLDER_TYPE = "DEFAULT" Then
-                ClassFolderWatcher.Restart_FolderWatch()
+                FOLDER_WATCHER.Restart_FolderWatch()
             End If
             If CONFIG.Config.FolderWatchScanStarted = True And FOLDER_TYPE = "SCAN" Then
-                ClassFolderWatcher.Restart_FolderWatchSCAN()
+                FOLDER_WATCHER.Restart_FolderWatchSCAN()
             End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CheckFolder:")
@@ -304,7 +306,7 @@ Public Class frmConfig_Basic
 
     End Sub
     Sub CheckFW_State()
-        Select Case ClassFolderWatcher.StartStop_FolderWatch()
+        Select Case FOLDER_WATCHER.StartStop_FolderWatch()
             Case 1
                 If USER_LANGUAGE = "de-DE" Then
                     btnstartstop1.Text = "Überwachung stoppen"
@@ -324,7 +326,7 @@ Public Class frmConfig_Basic
         End Select
     End Sub
     Sub CheckFWSCAN_State()
-        Select Case ClassFolderWatcher.StartStop_FolderWatchSCAN()
+        Select Case FOLDER_WATCHER.StartStop_FolderWatchSCAN()
             Case 1
                 If USER_LANGUAGE = "de-DE" Then
                     btnstartstop2.Text = "Überwachung stoppen"
@@ -362,7 +364,7 @@ Public Class frmConfig_Basic
             LOGCONFIG.Debug = Not chkLogErrorsOnly.Checked
         End If
     End Sub
-    <STAThread()> _
+    <STAThread()>
     Private Sub frmConfig_Basic_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         Load_Basics()
         formloaded = True
@@ -373,8 +375,9 @@ Public Class frmConfig_Basic
             chkLogErrorsOnly.Checked = CONFIG.Config.LogErrorsOnly
 
             If Not MyConnectionString = String.Empty Then
-                Dim csb As New SqlClient.SqlConnectionStringBuilder
-                csb.ConnectionString = MyConnectionString
+                Dim csb As New SqlClient.SqlConnectionStringBuilder With {
+                    .ConnectionString = MyConnectionString
+                }
                 Dim constr = MyConnectionString
                 Try
                     If Not constr.Contains("Trusted_Connection") Then
@@ -404,7 +407,7 @@ Public Class frmConfig_Basic
 
     End Sub
     Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click
-        Process.Start(ClassLogger.DateiSpeicherort)
+        Process.Start(LOGCONFIG.LogDirectory)
     End Sub
     Private Sub btnApplicationFolder_Click(sender As Object, e As EventArgs) Handles btnApplicationFolder.Click
         Process.Start(Application.UserAppDataPath())
@@ -452,15 +455,6 @@ Public Class frmConfig_Basic
         MsgBox("Changes saved.", MsgBoxStyle.Information)
     End Sub
 
-    Private Sub btnLogMail_Click(sender As Object, e As EventArgs) Handles btnLogMail.Click
-        ClassEmail.Send_Log_Mail("<b> Log-/SupportMail von DD GLOBIX.</b> <p>", _
-                               "Support-Mail GLOBIX", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support@didalog.de", False, True)
-    End Sub
-
-    Private Sub cmbLanguage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbLanguage.SelectedIndexChanged
-
-    End Sub
-
     Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
         Dim result As MsgBoxResult
         If USER_LANGUAGE = "de-DE" Then
@@ -483,7 +477,7 @@ Public Class frmConfig_Basic
                 Dim update As String = "UPDATE TBDD_USER SET [LANGUAGE] = '" & lang & "' WHERE GUID = " & USER_ID
                 USER_LANGUAGE = lang
 
-                If ClassDatabase.Execute_non_Query(update, True) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(update) = True Then
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Die Sprache wurde erfolgreich geändert!", MsgBoxStyle.Information)
                     Else
@@ -514,6 +508,6 @@ Public Class frmConfig_Basic
         ' Specify that the link was visited.
         Me.LinkLabel1.LinkVisited = True
         ' Navigate to a URL.
-        System.Diagnostics.Process.Start("http://www.didalog.de/Support")
+        Process.Start("https://digitaldata.works/support")
     End Sub
 End Class

Global_Indexer/frmConnections.resx

@@ -918,8 +918,8 @@
   <data name="BarButtonItem1.Caption" xml:space="preserve">
     <value>Neue Verbindung</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -940,7 +940,7 @@
   <data name="BarButtonItem2.Caption" xml:space="preserve">
     <value>Verbindung Löschen</value>
   </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -962,7 +962,7 @@
   <data name="BarButtonItem3.Caption" xml:space="preserve">
     <value>Verbindung Speichern</value>
   </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -981,7 +981,7 @@
   <data name="BarButtonItem4.Caption" xml:space="preserve">
     <value>Verbindungen neu laden</value>
   </data>
-  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1007,7 +1007,7 @@
   <data name="labelStatus.Caption" xml:space="preserve">
     <value>Status</value>
   </data>
-  <data name="labelStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1031,7 +1031,7 @@
   <data name="BarButtonItem5.Caption" xml:space="preserve">
     <value>Verbindung testen</value>
   </data>
-  <data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1076,7 +1076,7 @@
     <value>RibbonStatusBar1</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1088,7 +1088,7 @@
     <value>RibbonControl1</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1114,7 +1114,7 @@
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>
   </data>
-  <data name="frmConnections.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmConnections.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1169,60 +1169,60 @@
     <value>BarButtonItem1</value>
   </data>
   <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
     <value>BarButtonItem2</value>
   </data>
   <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
     <value>BarButtonItem3</value>
   </data>
   <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarButtonItem4.Name" xml:space="preserve">
     <value>BarButtonItem4</value>
   </data>
   <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelStatus.Name" xml:space="preserve">
     <value>labelStatus</value>
   </data>
   <data name="&gt;&gt;labelStatus.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
     <value>RibbonPageGroup1</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarButtonItem5.Name" xml:space="preserve">
     <value>BarButtonItem5</value>
   </data>
   <data name="&gt;&gt;BarButtonItem5.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmConnections</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Global_Indexer/frmEmailIndexing.resx

@@ -153,8 +153,8 @@
   <metadata name="IDX_EMAIL_TOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -172,7 +172,7 @@
         Cjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -188,7 +188,7 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -209,7 +209,7 @@
         bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

Global_Indexer/frmEmailIndexing.vb

@@ -100,7 +100,7 @@ Public Class frmEmailIndexing
     Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
         Try
             Dim oSQL = $"DELETE FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '{OBJECTTYPETextBox.Text}'"
-            ClassDatabase.Execute_non_Query(oSQL)
+            DATABASE_ECM.ExecuteNonQuery(oSQL)
             TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Fill(MyDataset.TBGI_OBJECTTYPE_EMAIL_INDEX, OBJECTTYPETextBox.Text)
         Catch ex As Exception
             LOGGER.Error(ex)

Global_Indexer/frmHistory.resx

@@ -196,8 +196,8 @@
   <data name="ToolStripButton1.Text" xml:space="preserve">
     <value>Alle Dateien laden</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
     <value>Center</value>
   </data>
   <data name="colFILENAME_NEW.Width" type="System.Int32, mscorlib">
@@ -222,7 +222,7 @@
     <value>0</value>
   </data>
   <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="GridControl1.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
@@ -257,8 +257,8 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1089, 362</value>
   </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
     <value>None</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
@@ -268,7 +268,7 @@
     <value>colADDED_WHEN</value>
   </data>
   <data name="&gt;&gt;colFILENAME_ORIGINAL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -310,7 +310,7 @@
     <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;colFILENAME_NEW.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="colADDED_WHEN.Caption" xml:space="preserve">
     <value>Erstellt wann</value>
@@ -328,7 +328,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>
@@ -337,7 +337,7 @@
     <value>Nächste verschieben</value>
   </data>
   <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="GridControl1.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
     <value>Tile</value>
@@ -400,7 +400,7 @@
     <value>6, 25</value>
   </data>
   <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="TBGI_HISTORYBindingNavigator.Text" xml:space="preserve">
     <value>BindingNavigator1</value>
@@ -456,8 +456,8 @@
   <data name="&gt;&gt;TBGI_HISTORYBindingNavigator.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
     <value>Default</value>
   </data>
   <data name="colFILENAME_NEW.VisibleIndex" type="System.Int32, mscorlib">

Global_Indexer/frmIndex.designer.vb

@@ -31,7 +31,8 @@ Partial Class frmIndex
         Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlIndex = New System.Windows.Forms.Panel()
-        Me.ComboboxDoctype = New DevExpress.XtraEditors.ComboBoxEdit()
+        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.checkMultiindex = New DevExpress.XtraEditors.CheckEdit()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
         Me.BarToggleSwitchItem2 = New DevExpress.XtraBars.BarToggleSwitchItem()
@@ -51,9 +52,10 @@ Partial Class frmIndex
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
-        Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.checkMultiindex = New DevExpress.XtraEditors.CheckEdit()
         Me.btnOK = New DevExpress.XtraEditors.SimpleButton()
+        Me.ComboboxDoctype = New DevExpress.XtraEditors.SearchLookUpEdit()
+        Me.SearchLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.MyDataset = New Global_Indexer.MyDataset()
         Me.VWDDINDEX_MANBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -68,10 +70,11 @@ Partial Class frmIndex
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
         Me.SplitContainer1.SuspendLayout()
-        CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
         CType(Me.checkMultiindex.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VWDDINDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VWINDEX_AUTOMBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -87,8 +90,8 @@ Partial Class frmIndex
         'SplitContainer1.Panel1
         '
         Me.SplitContainer1.Panel1.Controls.Add(Me.pnlIndex)
-        Me.SplitContainer1.Panel1.Controls.Add(Me.ComboboxDoctype)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Panel2)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ComboboxDoctype)
         '
         'SplitContainer1.Panel2
         '
@@ -100,17 +103,26 @@ Partial Class frmIndex
         Me.pnlIndex.BackColor = System.Drawing.SystemColors.ControlLight
         Me.pnlIndex.Name = "pnlIndex"
         '
-        'ComboboxDoctype
+        'Panel2
         '
-        resources.ApplyResources(Me.ComboboxDoctype, "ComboboxDoctype")
-        Me.ComboboxDoctype.MenuManager = Me.RibbonControl1
-        Me.ComboboxDoctype.Name = "ComboboxDoctype"
-        SerializableAppearanceObject1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
-        SerializableAppearanceObject1.Options.UseBackColor = True
-        Me.ComboboxDoctype.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboboxDoctype.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines), resources.GetString("ComboboxDoctype.Properties.Buttons1"), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons2"), Integer), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons3"), Boolean), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons4"), Boolean), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons5"), Boolean), EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, resources.GetString("ComboboxDoctype.Properties.Buttons6"), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons7"), Object), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons8"), DevExpress.Utils.SuperToolTip), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons9"), DevExpress.Utils.ToolTipAnchor))})
-        Me.ComboboxDoctype.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
-        Me.ComboboxDoctype.Properties.NullText = resources.GetString("ComboboxDoctype.Properties.NullText")
-        Me.ComboboxDoctype.Properties.Padding = New System.Windows.Forms.Padding(5)
+        Me.Panel2.BackColor = System.Drawing.Color.Transparent
+        Me.Panel2.Controls.Add(Me.checkMultiindex)
+        Me.Panel2.Controls.Add(Me.btnOK)
+        resources.ApplyResources(Me.Panel2, "Panel2")
+        Me.Panel2.Name = "Panel2"
+        '
+        'checkMultiindex
+        '
+        resources.ApplyResources(Me.checkMultiindex, "checkMultiindex")
+        Me.checkMultiindex.MenuManager = Me.RibbonControl1
+        Me.checkMultiindex.Name = "checkMultiindex"
+        Me.checkMultiindex.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.checkMultiindex.Properties.Appearance.Font = CType(resources.GetObject("checkMultiindex.Properties.Appearance.Font"), System.Drawing.Font)
+        Me.checkMultiindex.Properties.Appearance.ForeColor = System.Drawing.Color.DarkRed
+        Me.checkMultiindex.Properties.Appearance.Options.UseBackColor = True
+        Me.checkMultiindex.Properties.Appearance.Options.UseFont = True
+        Me.checkMultiindex.Properties.Appearance.Options.UseForeColor = True
+        Me.checkMultiindex.Properties.Caption = resources.GetString("checkMultiindex.Properties.Caption")
         '
         'RibbonControl1
         '
@@ -253,27 +265,6 @@ Partial Class frmIndex
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
         '
-        'Panel2
-        '
-        Me.Panel2.BackColor = System.Drawing.Color.Transparent
-        Me.Panel2.Controls.Add(Me.checkMultiindex)
-        Me.Panel2.Controls.Add(Me.btnOK)
-        resources.ApplyResources(Me.Panel2, "Panel2")
-        Me.Panel2.Name = "Panel2"
-        '
-        'checkMultiindex
-        '
-        resources.ApplyResources(Me.checkMultiindex, "checkMultiindex")
-        Me.checkMultiindex.MenuManager = Me.RibbonControl1
-        Me.checkMultiindex.Name = "checkMultiindex"
-        Me.checkMultiindex.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.checkMultiindex.Properties.Appearance.Font = CType(resources.GetObject("checkMultiindex.Properties.Appearance.Font"), System.Drawing.Font)
-        Me.checkMultiindex.Properties.Appearance.ForeColor = System.Drawing.Color.DarkRed
-        Me.checkMultiindex.Properties.Appearance.Options.UseBackColor = True
-        Me.checkMultiindex.Properties.Appearance.Options.UseFont = True
-        Me.checkMultiindex.Properties.Appearance.Options.UseForeColor = True
-        Me.checkMultiindex.Properties.Caption = resources.GetString("checkMultiindex.Properties.Caption")
-        '
         'btnOK
         '
         resources.ApplyResources(Me.btnOK, "btnOK")
@@ -282,6 +273,37 @@ Partial Class frmIndex
         Me.btnOK.ImageOptions.SvgImage = CType(resources.GetObject("btnOK.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btnOK.Name = "btnOK"
         '
+        'ComboboxDoctype
+        '
+        resources.ApplyResources(Me.ComboboxDoctype, "ComboboxDoctype")
+        Me.ComboboxDoctype.MenuManager = Me.RibbonControl1
+        Me.ComboboxDoctype.Name = "ComboboxDoctype"
+        SerializableAppearanceObject1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
+        SerializableAppearanceObject1.Options.UseBackColor = True
+        Me.ComboboxDoctype.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboboxDoctype.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines), resources.GetString("ComboboxDoctype.Properties.Buttons1"), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons2"), Integer), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons3"), Boolean), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons4"), Boolean), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons5"), Boolean), EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, resources.GetString("ComboboxDoctype.Properties.Buttons6"), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons7"), Object), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons8"), DevExpress.Utils.SuperToolTip), CType(resources.GetObject("ComboboxDoctype.Properties.Buttons9"), DevExpress.Utils.ToolTipAnchor))})
+        Me.ComboboxDoctype.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
+        Me.ComboboxDoctype.Properties.NullText = resources.GetString("ComboboxDoctype.Properties.NullText")
+        Me.ComboboxDoctype.Properties.Padding = New System.Windows.Forms.Padding(5)
+        Me.ComboboxDoctype.Properties.PopupSizeable = False
+        Me.ComboboxDoctype.Properties.PopupView = Me.SearchLookUpEdit1View
+        Me.ComboboxDoctype.Properties.ShowClearButton = False
+        '
+        'SearchLookUpEdit1View
+        '
+        Me.SearchLookUpEdit1View.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName})
+        Me.SearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
+        Me.SearchLookUpEdit1View.Name = "SearchLookUpEdit1View"
+        Me.SearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.SearchLookUpEdit1View.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never
+        Me.SearchLookUpEdit1View.OptionsView.ShowGroupPanel = False
+        Me.SearchLookUpEdit1View.OptionsView.ShowIndicator = False
+        '
+        'colName
+        '
+        resources.ApplyResources(Me.colName, "colName")
+        Me.colName.FieldName = "Name"
+        Me.colName.Name = "colName"
+        '
         'DocumentViewer1
         '
         resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
@@ -349,10 +371,11 @@ Partial Class frmIndex
         Me.SplitContainer1.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.ResumeLayout(False)
-        CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel2.ResumeLayout(False)
         CType(Me.checkMultiindex.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VWDDINDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VWINDEX_AUTOMBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -403,5 +426,7 @@ Partial Class frmIndex
     Friend WithEvents btnOK As DevExpress.XtraEditors.SimpleButton
     Friend WithEvents checkMultiindex As DevExpress.XtraEditors.CheckEdit
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents ComboboxDoctype As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents ComboboxDoctype As DevExpress.XtraEditors.SearchLookUpEdit
+    Friend WithEvents SearchLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn
 End Class

Global_Indexer/frmIndex.en.resx

@@ -127,8 +127,8 @@
   <data name="checkItemTopMost.Caption" xml:space="preserve">
     <value>Cover all other windows</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="checkItemTopMost.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="checkItemTopMost.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -157,7 +157,7 @@
   <data name="checkItemDeleteSource.Caption" xml:space="preserve">
     <value>Delete Source File</value>
   </data>
-  <data name="checkItemDeleteSource.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemDeleteSource.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -180,7 +180,7 @@
   <data name="checkItemPreselection.Caption" xml:space="preserve">
     <value>Remember Selected Profile</value>
   </data>
-  <data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -213,7 +213,7 @@
         cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="labelError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -234,7 +234,7 @@
         dmc+Cw==
 </value>
   </data>
-  <data name="labelFilePath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelFilePath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -257,7 +257,7 @@
   <data name="checkItemPreview.Caption" xml:space="preserve">
     <value>Filepreview active</value>
   </data>
-  <data name="checkItemPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -279,7 +279,7 @@
         OCwyNCwxOCwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="labelNotice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelNotice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -303,7 +303,7 @@
   <data name="BarButtonItem1.Caption" xml:space="preserve">
     <value>Skip current file</value>
   </data>
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -331,7 +331,7 @@
   <data name="checkMultiindex.Properties.Caption" xml:space="preserve">
     <value>Multi-Indexing - Index all follwing files (0) identical</value>
   </data>
-  <data name="btnOK.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnOK.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

Global_Indexer/frmIndex.resx

@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 157</value>
+    <value>0, 158</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="pnlIndex.AutoScroll" type="System.Boolean, mscorlib">
@@ -136,7 +136,7 @@
     <value>0, 30</value>
   </data>
   <data name="pnlIndex.Size" type="System.Drawing.Size, System.Drawing">
-    <value>636, 434</value>
+    <value>636, 431</value>
   </data>
   <data name="pnlIndex.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -156,11 +156,11 @@
   <data name="&gt;&gt;pnlIndex.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="ComboboxDoctype.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
+  <data name="checkMultiindex.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="ComboboxDoctype.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="checkMultiindex.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 20</value>
   </data>
   <data name="BarToggleSwitchItem1.Caption" xml:space="preserve">
     <value>Lösche Ursprungsdatei</value>
@@ -171,10 +171,10 @@
   <data name="checkItemTopMost.Caption" xml:space="preserve">
     <value>Andere Fenster überdecken</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="checkItemTopMost.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="checkItemTopMost.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEMEAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -201,9 +201,9 @@
   <data name="checkItemDeleteSource.Caption" xml:space="preserve">
     <value>Ursprungsdatei löschen</value>
   </data>
-  <data name="checkItemDeleteSource.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemDeleteSource.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPECAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -224,9 +224,9 @@
   <data name="checkItemPreselection.Caption" xml:space="preserve">
     <value>Profilauswahl merken</value>
   </data>
-  <data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcFAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -260,9 +260,9 @@
   <data name="labelError.Caption" xml:space="preserve">
     <value>labelError</value>
   </data>
-  <data name="labelError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABIDAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -290,9 +290,9 @@
   <data name="labelFilePath.Caption" xml:space="preserve">
     <value>labelFilePath</value>
   </data>
-  <data name="labelFilePath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelFilePath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -313,9 +313,9 @@
   <data name="checkItemPreview.Caption" xml:space="preserve">
     <value>Dateivorschau aktiv</value>
   </data>
-  <data name="checkItemPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="checkItemPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -338,9 +338,9 @@
   <data name="labelNotice.Caption" xml:space="preserve">
     <value>labelNotice</value>
   </data>
-  <data name="labelNotice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="labelNotice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -368,9 +368,9 @@
   <data name="BarButtonItem1.Caption" xml:space="preserve">
     <value>Datei überspringen</value>
   </data>
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -400,19 +400,19 @@
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 157</value>
+    <value>1076, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 677</value>
+    <value>0, 675</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 22</value>
+    <value>1076, 24</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -424,7 +424,7 @@
     <value>RibbonControl1</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -432,64 +432,6 @@
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ComboboxDoctype.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v19.2">
-    <value>Combo</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons1" xml:space="preserve">
-    <value />
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons2" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons3" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons4" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons5" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons6" xml:space="preserve">
-    <value />
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons7" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons8" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="ComboboxDoctype.Properties.Buttons9" type="DevExpress.Utils.ToolTipAnchor, DevExpress.Utils.v19.2">
-    <value>Default</value>
-  </data>
-  <data name="ComboboxDoctype.Properties.NullText" xml:space="preserve">
-    <value>Bitte wählen Sie ein Profil</value>
-  </data>
-  <data name="ComboboxDoctype.Size" type="System.Drawing.Size, System.Drawing">
-    <value>636, 30</value>
-  </data>
-  <data name="ComboboxDoctype.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;ComboboxDoctype.Name" xml:space="preserve">
-    <value>ComboboxDoctype</value>
-  </data>
-  <data name="&gt;&gt;ComboboxDoctype.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;ComboboxDoctype.Parent" xml:space="preserve">
-    <value>SplitContainer1.Panel1</value>
-  </data>
-  <data name="&gt;&gt;ComboboxDoctype.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="checkMultiindex.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="checkMultiindex.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 20</value>
-  </data>
   <data name="checkMultiindex.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold</value>
   </data>
@@ -497,7 +439,7 @@
     <value>Multi-Indexing - Alle nachfolgenden Dateien (0) identisch indexieren</value>
   </data>
   <data name="checkMultiindex.Size" type="System.Drawing.Size, System.Drawing">
-    <value>441, 18</value>
+    <value>441, 20</value>
   </data>
   <data name="checkMultiindex.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -506,7 +448,7 @@
     <value>checkMultiindex</value>
   </data>
   <data name="&gt;&gt;checkMultiindex.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkMultiindex.Parent" xml:space="preserve">
     <value>Panel2</value>
@@ -520,9 +462,9 @@
   <data name="btnOK.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 11.25pt, style=Bold</value>
   </data>
-  <data name="btnOK.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnOK.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEQCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -553,7 +495,7 @@
     <value>btnOK</value>
   </data>
   <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
     <value>Panel2</value>
@@ -565,7 +507,7 @@
     <value>Bottom</value>
   </data>
   <data name="Panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 464</value>
+    <value>0, 461</value>
   </data>
   <data name="Panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 3, 2, 3</value>
@@ -586,6 +528,73 @@
     <value>SplitContainer1.Panel1</value>
   </data>
   <data name="&gt;&gt;Panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="ComboboxDoctype.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="ComboboxDoctype.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ComboboxDoctype.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+    <value>Combo</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons1" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons2" type="System.Int32, mscorlib">
+    <value>20</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons3" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons4" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons5" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons6" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons7" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons8" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="ComboboxDoctype.Properties.Buttons9" type="DevExpress.Utils.ToolTipAnchor, DevExpress.Utils.v21.2">
+    <value>Default</value>
+  </data>
+  <data name="ComboboxDoctype.Properties.NullText" xml:space="preserve">
+    <value>Bitte wählen Sie ein Profil</value>
+  </data>
+  <data name="colName.Caption" xml:space="preserve">
+    <value>Profile Name</value>
+  </data>
+  <data name="colName.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="colName.VisibleIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="ComboboxDoctype.Size" type="System.Drawing.Size, System.Drawing">
+    <value>636, 30</value>
+  </data>
+  <data name="ComboboxDoctype.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;ComboboxDoctype.Name" xml:space="preserve">
+    <value>ComboboxDoctype</value>
+  </data>
+  <data name="&gt;&gt;ComboboxDoctype.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;ComboboxDoctype.Parent" xml:space="preserve">
+    <value>SplitContainer1.Panel1</value>
+  </data>
+  <data name="&gt;&gt;ComboboxDoctype.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <data name="&gt;&gt;SplitContainer1.Panel1.Name" xml:space="preserve">
@@ -610,7 +619,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>436, 520</value>
+    <value>436, 517</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -619,7 +628,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.3.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.4.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>
@@ -640,7 +649,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 520</value>
+    <value>1076, 517</value>
   </data>
   <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
     <value>636</value>
@@ -712,103 +721,115 @@
     <value>BarToggleSwitchItem1</value>
   </data>
   <data name="&gt;&gt;BarToggleSwitchItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarToggleSwitchItem2.Name" xml:space="preserve">
     <value>BarToggleSwitchItem2</value>
   </data>
   <data name="&gt;&gt;BarToggleSwitchItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkItemTopMost.Name" xml:space="preserve">
     <value>checkItemTopMost</value>
   </data>
   <data name="&gt;&gt;checkItemTopMost.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkItemDeleteSource.Name" xml:space="preserve">
     <value>checkItemDeleteSource</value>
   </data>
   <data name="&gt;&gt;checkItemDeleteSource.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkItemPreselection.Name" xml:space="preserve">
     <value>checkItemPreselection</value>
   </data>
   <data name="&gt;&gt;checkItemPreselection.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelError.Name" xml:space="preserve">
     <value>labelError</value>
   </data>
   <data name="&gt;&gt;labelError.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarStaticItem1.Name" xml:space="preserve">
     <value>BarStaticItem1</value>
   </data>
   <data name="&gt;&gt;BarStaticItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarStaticItem2.Name" xml:space="preserve">
     <value>BarStaticItem2</value>
   </data>
   <data name="&gt;&gt;BarStaticItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelFilePath.Name" xml:space="preserve">
     <value>labelFilePath</value>
   </data>
   <data name="&gt;&gt;labelFilePath.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkItemPreview.Name" xml:space="preserve">
     <value>checkItemPreview</value>
   </data>
   <data name="&gt;&gt;checkItemPreview.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelNotice.Name" xml:space="preserve">
     <value>labelNotice</value>
   </data>
   <data name="&gt;&gt;labelNotice.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarListItem1.Name" xml:space="preserve">
     <value>BarListItem1</value>
   </data>
   <data name="&gt;&gt;BarListItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarStaticItem4.Name" xml:space="preserve">
     <value>BarStaticItem4</value>
   </data>
   <data name="&gt;&gt;BarStaticItem4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
     <value>BarButtonItem1</value>
   </data>
   <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
     <value>RibbonPageGroup3</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
     <value>RibbonPageGroup2</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;SearchLookUpEdit1View.Name" xml:space="preserve">
+    <value>SearchLookUpEdit1View</value>
+  </data>
+  <data name="&gt;&gt;SearchLookUpEdit1View.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;colName.Name" xml:space="preserve">
+    <value>colName</value>
+  </data>
+  <data name="&gt;&gt;colName.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;MyDataset.Name" xml:space="preserve">
     <value>MyDataset</value>
@@ -850,24 +871,24 @@
     <value>PdfBarController1</value>
   </data>
   <data name="&gt;&gt;PdfBarController1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;PdfBarController2.Name" xml:space="preserve">
     <value>PdfBarController2</value>
   </data>
   <data name="&gt;&gt;PdfBarController2.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmIndex</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Global_Indexer/frmIndex.vb

@@ -5,20 +5,22 @@ Imports System.Security.AccessControl
 Imports System.Security.Principal
 Imports System.DirectoryServices
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Language
 Imports DigitalData.Controls.LookupGrid
 Imports DigitalData.GUIs.GlobalIndexer
 Imports DevExpress.XtraEditors.Controls
 Imports Limilabs.Mail
 Imports Limilabs.Mail.Headers
+Imports DevExpress.XtraEditors
 
 Public Class frmIndex
 #Region "+++++ Variablen ++++++"
     Public vPathFile As String
     Private MULTIFILES As Integer
-    Private akttxtbox As TextBox
+    Private ReadOnly akttxtbox As TextBox
     Dim DT_INDEXEMAN As DataTable
     Public FormLoaded As Boolean = False
-    Private Shared _Instance As frmIndex = Nothing
+    Private Shared ReadOnly _Instance As frmIndex = Nothing
     Dim DropType As String
     Private Shared WDDirect As Boolean = False
 
@@ -42,7 +44,9 @@ Public Class frmIndex
 
     Private Const LANG_DE = "de-DE"
 
-    Private _Logger As Logger
+    Private Property DocTypes As New List(Of DocType)
+
+    Private ReadOnly _Logger As Logger
 
 #End Region
 
@@ -141,11 +145,11 @@ Public Class frmIndex
                     If DR.Item("SQL_CHECK").ToString <> String.Empty Then
                         Dim connectionString As String
                         Dim sql As String
-                        connectionString = ClassFormFunctions.GetConnectionString(DR.Item("CONNECTION_ID"))
+                        connectionString = DATABASE_ECM.Get_ConnectionStringforID(DR.Item("CONNECTION_ID"))
                         If connectionString <> "" Then
                             Dim sqlscalar = DR.Item("SQL_CHECK")
                             Select Case DR.Item("DATENTYP")
-                                Case "INTEGER"
+                                Case ClassConstants.INDEX_TYPE_INTEGER
                                     sqlscalar = sqlscalar.ToString.Replace("@manValue", wert)
                                 Case Else
                                     sqlscalar = sqlscalar.ToString.Replace("@manValue", "'" & wert & "'")
@@ -154,10 +158,12 @@ Public Class frmIndex
                             sql = sqlscalar
                             Dim ergebnis As Integer
                             If DR.Item("SQL_PROVIDER") = "Oracle" Then
-                                ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString)
+
+                                ' ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString)
+                                LOGGER.Warn("Oracle is not supported")
                             Else
                                 'MSQL
-                                ergebnis = ClassDatabase.Execute_Scalar(sql, connectionString)
+                                ergebnis = DATABASE_ECM.GetScalarValueWithConnection(sql, connectionString)
                             End If
 
                             Select Case ergebnis
@@ -218,7 +224,6 @@ Public Class frmIndex
                                     _Logger.Info(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
                                     Return DR.Item("Indexwert")
                                 Else
-                                    'Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True)
                                     If opt = False Then
                                         _Logger.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
                                         ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
@@ -281,15 +286,18 @@ Public Class frmIndex
     Function GetAutomaticIndexSQLValue(SQLCommand As String, vconnectionID As Integer, vProvider As String) As String
         Try
             Dim oConnectionString As String
-            oConnectionString = ClassFormFunctions.GetConnectionString(vconnectionID)
+            oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(vconnectionID)
             If oConnectionString <> "" Then
                 'NEU
                 Dim oErgebnis
                 'Welcher Provider? 
                 If vProvider.ToLower = "oracle" Then
-                    oErgebnis = ClassDatabase.OracleExecute_Scalar(SQLCommand, oConnectionString)
+
+                    'oErgebnis = ClassDatabase.OracleExecute_Scalar(SQLCommand, oConnectionString)
+                    LOGGER.Warn("Oracle Database Queries are not supported")
+
                 Else 'im Moment nur SQL-Server
-                    oErgebnis = ClassDatabase.Execute_Scalar(SQLCommand, oConnectionString)
+                    oErgebnis = DATABASE_ECM.GetScalarValueWithConnection(SQLCommand, oConnectionString)
                 End If
 
                 If LogErrorsOnly = False Then
@@ -322,7 +330,7 @@ Public Class frmIndex
                 If oControl.Name.StartsWith("txt") Then
                     Dim box As DevExpress.XtraEditors.TextEdit = oControl
                     If box.Text = "" Then
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'", MyConnectionString, True)
+                        Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'")
                         If optional_index = False Then
 
                             If USER_LANGUAGE = LANG_DE Then
@@ -365,7 +373,7 @@ Public Class frmIndex
                     Dim oValues As List(Of String) = oLookup.Properties.SelectedValues
 
                     If oValues.Count = 0 Then
-                        Dim oIsOptionalIndex As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'", MyConnectionString, True)
+                        Dim oIsOptionalIndex As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'")
 
                         If oIsOptionalIndex = False Then
                             If USER_LANGUAGE = LANG_DE Then
@@ -389,7 +397,7 @@ Public Class frmIndex
                     Dim cmbSingle As TextBox = oControl
 
                     If cmbSingle.Text = "" Then
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'", MyConnectionString, True)
+                        Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'")
 
                         If optional_index = False Then
                             If USER_LANGUAGE = LANG_DE Then
@@ -410,7 +418,7 @@ Public Class frmIndex
                 ElseIf oControl.Name.StartsWith("cmb") Then
                     Dim cmb As ComboBox = oControl
                     If cmb.Text = "" Then
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'", MyConnectionString, True)
+                        Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'")
                         If optional_index = False Then
                             If USER_LANGUAGE = LANG_DE Then
                                 MsgBox(TEXT_MISSING_INPUT_DE, MsgBoxStyle.Exclamation, Text)
@@ -433,7 +441,7 @@ Public Class frmIndex
                     Dim oIndexName As String = Replace(dtp.Name, "dtp", "")
 
                     If dtp.Text = String.Empty Then
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'", MyConnectionString, True)
+                        Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'")
 
                         If optional_index = False Then
                             If USER_LANGUAGE = LANG_DE Then
@@ -453,7 +461,7 @@ Public Class frmIndex
                     End If
                 End If
                 If oControl.Name.StartsWith("chk") Then
-                    Dim chk As CheckBox = oControl
+                    Dim chk As CheckEdit = oControl
                     Indexwert_Postprocessing(Replace(chk.Name, "chk", ""), chk.Checked)
                     oResult = True
                 End If
@@ -488,7 +496,7 @@ Public Class frmIndex
                         'Die Nachbearbeitungsschritte laden
                         'FILE AND INDEX
                         'Zuerst nur die Fälle für die Variante ONLY FILE/FOLDER
-                        Dim DTNB As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE")
+                        Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE")
                         If DTNB Is Nothing = False Then
                             If DTNB.Rows.Count > 0 Then
                                 value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
@@ -498,7 +506,7 @@ Public Class frmIndex
                         End If
                         'Jetzt die Fälle für die Variante FILE AND INDEX
                         DTNB = Nothing
-                        DTNB = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE")
+                        DTNB = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE")
                         If DTNB Is Nothing = False Then
                             If DTNB.Rows.Count > 0 Then
                                 value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
@@ -519,7 +527,7 @@ Public Class frmIndex
             _Logger.Debug("#### Name_Generieren ####")
             Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1"
             Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG)
-            Dim DT1 As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim DT1 As DataTable = DATABASE_ECM.GetDatatable(sql)
             For Each row As DataRow In DT1.Rows
                 FILE_DELIMITER = row.Item("FILE_DELIMITER")
                 VERSION_DELIMITER = row.Item("VERSION_DELIMITER")
@@ -529,7 +537,7 @@ Public Class frmIndex
             Dim folder_Created As Boolean = False
             Dim oRAWZielordner As String
             Dim extension As String = System.IO.Path.GetExtension(CURRENT_WORKFILE)
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID)
+            Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID)
             sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW"
             sql_history_Index_Values = ""
             Dim AnzahlIndexe As Integer = 1
@@ -538,7 +546,7 @@ Public Class frmIndex
             CURR_WORKFILE_EXTENSION = extension
 
             oRAWZielordner = WINDREAM.GetNormalizedPath(DT.Rows(0).Item("ZIEL_PFAD"))
-            oRAWZielordner = Path.Combine("\\windream\objects", oRAWZielordner)
+            oRAWZielordner = Path.Combine(WINDREAM_BASEPATH, oRAWZielordner)
 
             '####
             ' Regulären Ausdruck zum Auslesen der Indexe definieren
@@ -561,7 +569,7 @@ Public Class frmIndex
                     Case "M"
                         _Logger.Debug("NameGenerieren: Manueller Index wird geprüft...")
                         Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')", MyConnectionString, True)
+                        Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')")
                         Dim oManValue As String = GetManIndex_Value(Indexname, "FILE", optional_index)
                         If oManValue <> String.Empty Then
                             Dim firstVectorValue = oManValue.Split(ClassConstants.VECTORSEPARATOR).First()
@@ -675,7 +683,7 @@ Public Class frmIndex
                                 NewFileString = _neuername
                             Else
                                 Do While File.Exists(_neuername)
-                                    version = version + 1
+                                    version += 1
                                     _neuername = Stammname.Replace(extension, "") & VERSION_DELIMITER & version & extension
                                     NewFileString = _neuername
                                 Loop
@@ -710,7 +718,7 @@ Public Class frmIndex
         End Try
 
     End Function
-    Private Function Write_Indizes()
+    Private Function Write_Indizes() As Boolean
         Try
             _Logger.NewBlock("Write_Indizes")
             _Logger.Info("Indexing file [{0}]", CURRENT_NEWFILENAME)
@@ -750,13 +758,13 @@ Public Class frmIndex
                                 End If
                             End If
 
-                            _Logger.Debug($"Manueller Indexvalue [{idxvalue.ToString}]...NOW THE INDEXING...")
+                            _Logger.Debug($"Manueller Indexvalue [{idxvalue}]...NOW THE INDEXING...")
                             Count += 1
 
 
                             ' den Typ des Zielindexes auslesen
                             Dim oIndexType As Integer = WINDREAM.GetIndexType(indexname)
-                            _Logger.Debug($"oIndexType [{oIndexType.ToString}]...")
+                            _Logger.Debug($"oIndexType [{oIndexType}]...")
                             If oIndexType < WINDREAM.WMObjectVariableValueTypeVector Then
                                 _Logger.Debug($"Indexing  oIndexType < WINDREAM.WMObjectVariableValueTypeVector...")
                                 indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, idxvalue, CURR_DOKART_OBJECTTYPE)
@@ -835,7 +843,7 @@ Public Class frmIndex
                     End If
                 Next
             End If
-            If DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Or CURRENT_NEWFILENAME.EndsWith(".msg") Then
+            If DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Or CURRENT_NEWFILENAME.ToUpper.EndsWith(".MSG") Or CURRENT_NEWFILENAME.ToUpper.EndsWith(".EML") Then
                 indexierung_erfolgreich = SetEmailIndicies(pIndexAttachment:=False)
                 If indexierung_erfolgreich = False Then
                     MsgBox("Error in SetEmailIndices - See log", MsgBoxStyle.Critical)
@@ -856,24 +864,22 @@ Public Class frmIndex
         End Try
         Return True
     End Function
-    Private Function WriteIndex2File(indexname As String, indexvalue As String)
+    Private Function WriteIndex2File(pIndexName As String, pIndexValue As String)
         Try
-            _Logger.Info("Indexvalue: " & indexvalue.ToString)
-            Return WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, indexvalue, CURR_DOKART_OBJECTTYPE)
+            _Logger.Info($"Indexing with Name {pIndexName} and Value: {pIndexValue}")
+            Return WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, pIndexName, pIndexValue, CURR_DOKART_OBJECTTYPE)
         Catch ex As Exception
             ShowErrorMessage(ex, "WriteIndex2File")
             Return False
         End Try
-
     End Function
 
     Private Function SetEmailIndicies(pIndexAttachment As Boolean) As Boolean
         Try
-            Dim oMsgFilePath As String = Path.Combine("\\windream\objects", CURRENT_NEWFILENAME)
-            Dim oMail As IMail = EMAIL.Load_Email(oMsgFilePath)
+            Dim oIndexNames As Dictionary(Of String, Object)
 
             Dim oSQL As String = $"SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '{CURR_DOKART_OBJECTTYPE}'"
-            Dim oTable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oTable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             If IsNothing(oTable) Then
                 _Logger.Info("Could not get Email Indicies for DocType = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
@@ -890,42 +896,63 @@ Public Class frmIndex
                 Return False
             End If
 
-            Dim oMessageId As String = oMail.MessageID
-            Dim oMessageFrom As String = EMAIL.Get_MessageSender(oMail)
-            Dim oMessageTo As String = EMAIL.Get_MessageReceiver(oMail)
-            Dim oSubject As String = oMail.Subject
-            Dim oDateIn As Date = oMail.Date
-
             Dim oRow As DataRow = oTable.Rows.Item(0)
-            Dim oIndexNames As New Dictionary(Of String, Object) From {
-                {"IDX_EMAIL_ID", oMessageId},
-                {"IDX_EMAIL_FROM", oMessageFrom},
-                {"IDX_EMAIL_TO", oMessageTo},
-                {"IDX_EMAIL_SUBJECT", oSubject},
-                {"IDX_EMAIL_DATE_IN", oDateIn}
-            }
 
-            If pIndexAttachment = True Then
-                oIndexNames.Add("IDX_CHECK_ATTACHMENT", True)
+            ' If file is an email files (eml,msg) parse it to extract email data and save for later
+            ' If file is an attachment, rely on the previously extracted value
+
+
+
+            If pIndexAttachment = False Then
+                LOGGER.Debug("Indexing Email File: [{0}]", CURRENT_NEWFILENAME)
+
+                Dim oMsgFilePath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
+                Dim oMail As IMail = EMAIL.Load_Email(oMsgFilePath)
+
+                Dim oMessageId As String = oMail.MessageID
+                LOGGER.Debug("MessageId: [{0}]", oMessageId)
+
+                Dim oMessageFrom As String = EMAIL.Get_MessageSender(oMail)
+                Dim oMessageTo As String = EMAIL.Get_MessageReceiver(oMail)
+                Dim oDateIn As Date = EMAIL.Get_MessageDate(oMail)
+                Dim oSubject As String = oMail.Subject
+
+                CURRENT_MESSAGEID = oMessageId
+                CURRENT_MESSAGEDATE = oDateIn
+                CURRENT_MESSAGESUBJECT = oSubject
+
+                oIndexNames = New Dictionary(Of String, Object) From {
+                    {"IDX_EMAIL_ID", oMessageId},
+                    {"IDX_EMAIL_FROM", oMessageFrom},
+                    {"IDX_EMAIL_TO", oMessageTo},
+                    {"IDX_EMAIL_SUBJECT", oSubject},
+                    {"IDX_EMAIL_DATE_IN", oDateIn}
+                }
+            Else
+                oIndexNames = New Dictionary(Of String, Object) From {
+                    {"IDX_EMAIL_ID", CURRENT_MESSAGEID},
+                    {"IDX_EMAIL_SUBJECT", CURRENT_MESSAGESUBJECT},
+                    {"IDX_EMAIL_DATE_IN", CURRENT_MESSAGEDATE},
+                    {"IDX_CHECK_ATTACHMENT", True}
+                }
             End If
 
+
             For Each oIndex In oIndexNames
                 Try
                     If oIndex.Value Is Nothing Then
                         LOGGER.Warn("Value for Index [{0}] was empty. Skipping.", oIndex.Key)
-                        Return False
+                        Continue For
 
                     End If
 
                     If TypeOf oIndex.Value Is String AndAlso oIndex.Value = String.Empty Then
                         LOGGER.Warn("Value for Index [{0}] was empty. Skipping.", oIndex.Key)
-                        Return False
+                        Continue For
 
                     End If
 
                     Dim oIndexingSuccessful = WriteIndex2File(oRow.Item(oIndex.Key), oIndex.Value)
-                    'Die aktuelle Message-ID zwischenspeichern
-                    CURRENT_MESSAGEID = oMessageId
 
                     If oIndexingSuccessful = False Then
                         MsgBox($"Error while Indexing Email at Index [{oIndex.Key}]", MsgBoxStyle.Critical)
@@ -951,7 +978,7 @@ Public Class frmIndex
     '    Dim _step As String = "1"
 
     '    Try
-    '        Dim oTempPath As String = Path.Combine("\\windream\objects", CURRENT_NEWFILENAME)
+    '        Dim oTempPath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
     '        Dim msg As Msg.Message = New Msg.Message(oTempPath)
     '        Dim msgDisplayTo = msg.DisplayTo
     '        Dim msgInternetAccountName = msg.InternetAccountName
@@ -996,7 +1023,7 @@ Public Class frmIndex
     '                finalize_pattern = rowregex.Item("REGEX")
     '            End If
     '        Next
-    '        Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
+    '        Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
     '        If IsNothing(DT) Then
     '            _Logger.Info("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "' RESULTED in NOTHING")
     '            Return False
@@ -1282,7 +1309,7 @@ Public Class frmIndex
     'Private Function SetAttachmentIndices()
     '    Dim indexierung_erfolgreich As Boolean = True
     '    Try
-    '        Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
+    '        Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
     '        If DT.Rows.Count = 1 Then
 
     '            If Not CURRENT_MESSAGEID Is Nothing Then
@@ -1335,7 +1362,7 @@ Public Class frmIndex
             End If
 
             Dim oStreamSuccessful = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
-            Dim oTempPath As String = Path.Combine("\\windream\objects", CURRENT_NEWFILENAME)
+            Dim oTempPath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
 
             _Logger.Debug("Checks for file [{0}]", oTempPath)
             _Logger.Debug("File streamed to Windream: {0}", oStreamSuccessful)
@@ -1357,7 +1384,7 @@ Public Class frmIndex
             Dim Stammname As String = _NewFilename
             Dim neuername As String = _NewFilename
             Do While File.Exists(neuername)
-                version = version + 1
+                version += 1
                 neuername = Stammname.Replace(extension, "") & _versionTz & version & extension
                 CURRENT_NEWFILENAME = neuername
             Loop
@@ -1379,19 +1406,19 @@ Public Class frmIndex
             Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}"
 
             Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{oCurrentWorkfile}','{oCurrentNewFilename}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')"
-            If ClassDatabase.Execute_non_Query(Insert_String) = True Then
+            If DATABASE_ECM.ExecuteNonQuery(Insert_String) = True Then
                 If CURRENT_MESSAGEID <> "" Then
                     Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY"
-                    Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True)
+                    Dim GUID = DATABASE_ECM.GetScalarValue(max)
                     Try
                         If GUID > 0 Then
                             Dim sql As String
                             If CURRENT_ISATTACHMENT = True Then
                                 sql = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
-                                ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+                                DATABASE_ECM.GetScalarValue(sql)
                             Else
                                 sql = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
-                                ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+                                DATABASE_ECM.GetScalarValue(sql)
                             End If
                         End If
                     Catch ex As Exception
@@ -1416,7 +1443,7 @@ Public Class frmIndex
                     Else
                         MsgBox($"Please Index file completely{vbNewLine}(Abort 1 of Indexdialog)", MsgBoxStyle.Information)
                     End If
-                    CancelAttempts = CancelAttempts + 1
+                    CancelAttempts += 1
                     e.Cancel = True
                 Case 1
                     Dim result As MsgBoxResult
@@ -1431,7 +1458,7 @@ Public Class frmIndex
                         Try
                             ABORT_INDEXING = True
                             Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')"
-                            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+                            Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql)
 
                             Dim anz = DT.Rows.Count
                             For Each Filerow As DataRow In DT.Rows
@@ -1450,7 +1477,7 @@ Public Class frmIndex
                                 End If
                             Next
                             'Zuerst die Daten des Ablaufs löschen
-                            If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then
+                            If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then
                                 If containsfw_file = True Then
                                     If USER_LANGUAGE = LANG_DE Then
                                         MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:")
@@ -1508,13 +1535,13 @@ Public Class frmIndex
 
         Try
             CURRENT_ISATTACHMENT = False
-            DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True)
+            DropType = DATABASE_ECM.GetScalarValue("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID)
 
             CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
             checkItemDeleteSource.Enabled = True
             checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
 
-            VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString)
+            VIEWER_LICENSE = DATABASE_ECM.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
 
             DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
 
@@ -1594,8 +1621,8 @@ Public Class frmIndex
 
                 Load_String()
 
-                DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
-                MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", MyConnectionString, True)
+                DTTBGI_REGEX_DOCTYPE = DATABASE_ECM.GetDatatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
+                MULTIFILES = DATABASE_ECM.GetScalarValue("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
                 MULTIINDEXING_ACTIVE = False
                 If MULTIFILES > 0 Then
                     If USER_LANGUAGE = LANG_DE Then
@@ -1646,40 +1673,48 @@ Public Class frmIndex
         FormLoaded = True
 
         Try
+            _Logger.Info("Profile Preselected enabled: {0}", CONFIG.Config.ProfilePreselection)
             ' Letzte Auswahl merken überschreibt die automatische selektion
             If CONFIG.Config.ProfilePreselection Then
                 checkItemPreselection.Checked = True
 
                 If CURRENT_LASTDOKART <> "" Then
-                    Dim oFoundDocType = ComboboxDoctype.Properties.Items.
-                        Cast(Of DocType)().
+                    _Logger.Info("Last Saved DocType: {0}", CURRENT_LASTDOKART)
+
+                    Dim oDocTypes As List(Of DocType) = DocTypes
+                    Dim oFoundDocType = oDocTypes.
                         Where(Function(dt) dt.Name = CURRENT_LASTDOKART).
                         FirstOrDefault()
 
                     If oFoundDocType IsNot Nothing Then
-                        ComboboxDoctype.SelectedItem = oFoundDocType
+                        _Logger.Info("Setting Last Saved DocType: {0}", CURRENT_LASTDOKART)
+
+                        ComboboxDoctype.EditValue = oFoundDocType
                     End If
 
-                    'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART)
                 End If
             End If
 
-            If ComboboxDoctype.SelectedItem Is Nothing And DTTBGI_REGEX_DOCTYPE.Rows.Count > 0 Then
+            Dim oApplyRegex = ComboboxDoctype.EditValue Is Nothing And DTTBGI_REGEX_DOCTYPE.Rows.Count > 0
+            _Logger.Info("Applying Profile Selection Regex: [{0}]", oApplyRegex)
+
+            If oApplyRegex Then
                 For Each oRoW As DataRow In DTTBGI_REGEX_DOCTYPE.Rows
                     Dim oOnlyFilename = Path.GetFileName(CURRENT_WORKFILE)
                     If Regex.IsMatch(oOnlyFilename, oRoW.Item("Regex")) Then
 
                         _Logger.Debug("There is a match on REGEX_DOCTYPE: [{0}]", oRoW.Item("DOCTYPE"))
                         _Logger.Debug("Regex: [{0}], FileName: [{1}]", oRoW.Item("Regex"), oOnlyFilename)
-                        'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE"))
 
-                        Dim oFoundDocType = ComboboxDoctype.Properties.Items.
-                            Cast(Of DocType)().
+                        Dim oDoctypes As List(Of DocType) = DocTypes
+                        Dim oFoundDocType As DocType = oDoctypes.
                             Where(Function(dt) dt.Guid = oRoW.Item("DOCTYPE_ID")).
                             FirstOrDefault()
 
                         If oFoundDocType IsNot Nothing Then
-                            ComboboxDoctype.SelectedItem = oFoundDocType
+                            _Logger.Debug("DocType found: [{0}]", oFoundDocType)
+                            ComboboxDoctype.EditValue = oFoundDocType
+
                             Exit For
                         End If
                     End If
@@ -1693,34 +1728,32 @@ Public Class frmIndex
         Try
             Dim sql = String.Format("SELECT DISTINCT DOCTYPE_ID, DOCTYPE, SEQUENCE FROM VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName)
             _Logger.Info("SQL DoctypeList: " & sql)
-            Dim oDoctypes = ClassDatabase.Return_Datatable(sql)
-            'cmbDokumentart.DataSource = oDoctypes
-            'cmbDokumentart.ValueMember = oDoctypes.Columns("DOCTYPE_ID").ColumnName
-            'cmbDokumentart.DisplayMember = oDoctypes.Columns("DOCTYPE").ColumnName
-            'cmbDokumentart.AutoCompleteMode = AutoCompleteMode.Suggest
-            'cmbDokumentart.AutoCompleteSource = AutoCompleteSource.ListItems
-            'cmbDokumentart.SelectedIndex = -1
-
-            ComboboxDoctype.Properties.Items.Clear()
-
+            Dim oDoctypes = DATABASE_ECM.GetDatatable(sql)
 
+            ComboboxDoctype.EditValue = Nothing
+            ComboboxDoctype.Properties.DataSource = Nothing
 
+            DocTypes.Clear()
             For Each oRow As DataRow In oDoctypes.Rows
-                Dim oDocType = New DocType With {.Guid = oRow.Item("DOCTYPE_ID"), .Name = oRow.Item("DOCTYPE")}
-                ComboboxDoctype.Properties.Items.Add(oDocType)
+                Dim oDocType = New DocType With {
+                    .Guid = oRow.Item("DOCTYPE_ID"),
+                    .Name = oRow.Item("DOCTYPE")
+                }
+                DocTypes.Add(oDocType)
             Next
 
-            ComboboxDoctype.SelectedIndex = -1
+            ComboboxDoctype.Properties.DataSource = DocTypes
         Catch ex As Exception
             ShowErrorMessage(ex, "Refresh_Dokart")
         End Try
     End Sub
 
-    Private Sub ComboBoxEdit1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboboxDoctype.SelectedIndexChanged
-        If ComboboxDoctype.SelectedIndex <> -1 And FormLoaded = True Then
-            Dim oSelectedItem As DocType = ComboboxDoctype.SelectedItem
+    Private Sub ComboBoxEdit1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboboxDoctype.EditValueChanged
+        If ComboboxDoctype.EditValue IsNot Nothing And FormLoaded = True Then
+            Dim oSelectedItem As DocType = ComboboxDoctype.EditValue
 
             CURRENT_DOKART_ID = oSelectedItem.Guid
+            CURRENT_LASTDOKART = oSelectedItem.Name
 
             'lblhinweis.Visible = False
             ClearNotice()
@@ -1730,7 +1763,7 @@ Public Class frmIndex
 
             pnlIndex.Controls.Clear()
             Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid
-            Dim oDoctypes As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql)
             Dim oDocType As DataRow = oDoctypes.Rows.Item(0)
 
             Dim oDestination As String = oDocType.Item("ZIEL_PFAD")
@@ -1738,7 +1771,7 @@ Public Class frmIndex
             Dim oNewDestination = Path.Combine(WINDREAM.ClientBasePath, oNormalized)
 
             If Directory.Exists(oDestination) = False Then
-                Dim oMessage = ""
+                Dim oMessage As String
 
                 If USER_LANGUAGE = "de-DE" Then
                     oMessage = $"Der Pfad für das ausgewählte Profil ist nicht erreichbar:{vbNewLine}[{oNewDestination}].{vbNewLine}{vbNewLine}Bitte wählen Sie ein anderes Profil."
@@ -1747,7 +1780,7 @@ Public Class frmIndex
                 End If
 
                 MsgBox(oMessage, MsgBoxStyle.Information, Text)
-                ComboboxDoctype.SelectedIndex = -1
+                ComboboxDoctype.EditValue = Nothing
             Else
                 WDDirect = oDocType.Item("WINDREAM_DIRECT")
                 CURRENT_DOKART_DUPLICATE_HANDLING = oDocType.Item("DUPLICATE_HANDLING")
@@ -1760,7 +1793,7 @@ Public Class frmIndex
         Dim sql
         Try
             sql = "select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid & " ORDER BY T.SEQUENCE"
-            DT_INDEXEMAN = ClassDatabase.Return_Datatable(sql)
+            DT_INDEXEMAN = DATABASE_ECM.GetDatatable(sql)
             pnlIndex.Visible = True
             LoadIndexe_Man()
         Catch ex As System.Exception
@@ -1821,14 +1854,14 @@ Public Class frmIndex
                 Dim AddNewItems As Boolean = oRow.Item("VKT_ADD_ITEM")
                 Dim PreventDuplicates As Boolean = oRow.Item("VKT_PREVENT_MULTIPLE_VALUES")
                 Dim oControlName As String = oRow.Item("NAME")
-                Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), 0)
+                Dim oConnectionId = Utils.NotNull(oRow.Item("CONNECTION_ID"), 0)
                 Dim oSQLSuggestion = oRow.Item("SUGGESTION")
                 Dim oSQLResult = oRow.Item("SQL_RESULT")
 
                 LOGGER.Debug("IndexName: {0}", oControlName)
                 LOGGER.Debug("SQL: {0}", oSQLResult)
 
-                If oDataType <> "BOOLEAN" Then
+                If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then
                     addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount)
                 End If
 
@@ -1838,12 +1871,12 @@ Public Class frmIndex
                 End If
 
                 Select Case oDataType
-                    Case "BOOLEAN"
-                        Dim chk As CheckBox = oControls.AddCheckBox(oControlName, oControlPosition, DefaultValue, oRow.Item("COMMENT").ToString)
+                    Case ClassConstants.INDEX_TYPE_BOOLEAN
+                        Dim chk As CheckEdit = oControls.AddCheckBox(oControlName, oControlPosition, DefaultValue, oRow.Item("COMMENT").ToString)
                         If Not IsNothing(chk) Then
                             pnlIndex.Controls.Add(chk)
                         End If
-                    Case "INTEGER"
+                    Case ClassConstants.INDEX_TYPE_INTEGER
                         If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then
                             Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates)
                             If Not IsNothing(oControl) Then
@@ -1856,7 +1889,7 @@ Public Class frmIndex
                                 pnlIndex.Controls.Add(oControl)
                             End If
                         End If
-                    Case "VARCHAR"
+                    Case ClassConstants.INDEX_TYPE_VARCHAR
                         If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then
                             Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates)
                             If Not IsNothing(oControl) Then
@@ -1911,7 +1944,7 @@ Public Class frmIndex
     End Sub
 
     Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer)
-        Dim oConnectionString = ClassFormFunctions.GetConnectionString(pConnectionId)
+        Dim oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(pConnectionId)
 
         If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then
             LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))
@@ -1923,7 +1956,8 @@ Public Class frmIndex
                 pSQLCommand = ClassPatterns.ReplaceInternalValues(pSQLCommand)
                 pSQLCommand = ClassPatterns.ReplaceUserValues(pSQLCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
 
-                Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False)
+                'Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False)
+                Dim oDatatable = DATABASE_ECM.GetDatatableWithConnection(pSQLCommand, oConnectionString)
                 Return oDatatable
             End If
         Else
@@ -1941,15 +1975,15 @@ Public Class frmIndex
             Dim oMeta = DirectCast(Control.Tag, ControlCreator.ControlMeta)
             Dim oIndexName As String = oMeta.IndexName
             Dim oSQL = $"SELECT * FROM TBDD_INDEX_MAN WHERE SQL_RESULT LIKE '%{oIndexName}%' AND DOK_ID = {CURRENT_DOKART_ID}"
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
 
             If Not IsNothing(oDatatable) Then
                 LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name)
 
                 For Each oRow As DataRow In oDatatable.Rows
-                    Dim oControlName As String = NotNull(oRow.Item("NAME"), "")
-                    Dim oConnectionId As Integer = NotNull(oRow.Item("CONNECTION_ID"), -1)
-                    Dim oControlSql As String = NotNull(oRow.Item("SQL_RESULT"), "")
+                    Dim oControlName As String = Utils.NotNull(oRow.Item("NAME"), "")
+                    Dim oConnectionId As Integer = Utils.NotNull(oRow.Item("CONNECTION_ID"), -1)
+                    Dim oControlSql As String = Utils.NotNull(oRow.Item("SQL_RESULT"), "")
 
                     If oConnectionId = -1 Or oControlSql = String.Empty Then
                         LOGGER.Warn("Missing SQL Query or ConnectionId for Control [{0}]! Continuing.", oControlName)
@@ -1975,8 +2009,9 @@ Public Class frmIndex
                 Exit Sub
             End If
 
-            Dim oConnectionString = ClassFormFunctions.GetConnectionString(SqlConnectionId)
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString)
+            Dim oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(SqlConnectionId)
+            'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString)
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(SqlCommand)
             Dim oFoundControl As Control = Nothing
 
             For Each oControl As Control In pnlIndex.Controls
@@ -2024,9 +2059,9 @@ Public Class frmIndex
                         oLookupControl.Properties.ValueMember = oDatatable.Columns.Item(0).ColumnName
                         oLookupControl.Properties.DisplayMember = oDatatable.Columns.Item(0).ColumnName
                     End If
-                Case GetType(ComboBox).Name
+                Case GetType(Windows.Forms.ComboBox).Name
                     LOGGER.Debug("Setting Value for Combobox [{0}]: [{1}]", oFoundControl.Name, "DATATABLE")
-                    DirectCast(oFoundControl, ComboBox).DataSource = oDatatable
+                    DirectCast(oFoundControl, Windows.Forms.ComboBox).DataSource = oDatatable
                 Case Else
                     LOGGER.Debug("Could not set depending control result for [{0}]", oFoundControl.GetType.Name)
             End Select
@@ -2095,17 +2130,17 @@ Public Class frmIndex
             ' 1. Schritt: Einfach-Indexe und Platzhalter ersetzen
             For Each oAutoIndexRow As DataRow In oDatatable
                 _Logger.Info("Working on AutomaticIndex: " & oAutoIndexRow.Item("INDEXNAME") & "...")
-                Dim oSqlResult As String = ClassHelper.NotNull(oAutoIndexRow.Item("SQL_RESULT"), "")
-                Dim oSqlActive As Boolean = ClassHelper.NotNull(oAutoIndexRow.Item("SQL_ACTIVE"), False)
-                Dim oSqlConnectionId As Integer = ClassHelper.NotNull(oAutoIndexRow.Item("CONNECTION_ID"), -1)
-                Dim oSqlProvider As String = ClassHelper.NotNull(oAutoIndexRow.Item("SQL_PROVIDER"), "")
+                Dim oSqlResult As String = Utils.NotNull(oAutoIndexRow.Item("SQL_RESULT"), "")
+                Dim oSqlActive As Boolean = Utils.NotNull(oAutoIndexRow.Item("SQL_ACTIVE"), False)
+                Dim oSqlConnectionId As Integer = Utils.NotNull(oAutoIndexRow.Item("CONNECTION_ID"), -1)
+                Dim oSqlProvider As String = Utils.NotNull(oAutoIndexRow.Item("SQL_PROVIDER"), "")
                 Dim oEndResult As New List(Of String)
 
                 ' Wenn kein SQL Befehl vorhanden oder aktiv ist, 
                 ' versuchen wir, die Spalte VALUE zu ersetzen
                 If oSqlResult = String.Empty Or oSqlActive = 0 Then
                     Dim oPlaceholderResult As String
-                    Dim oValue As String = ClassHelper.NotNull(oAutoIndexRow.Item("VALUE"), "")
+                    Dim oValue As String = Utils.NotNull(oAutoIndexRow.Item("VALUE"), "")
 
                     oPlaceholderResult = GetPlaceholderValue(oValue, CURRENT_WORKFILE, USER_SHORTNAME)
 
@@ -2137,7 +2172,7 @@ Public Class frmIndex
                         oSqlResult = oSqlResult.Replace(oMatch.Value, oPlaceholderResult)
                     End If
 
-                    oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True)
+                    oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')")
                     oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex)
 
                     ' Wenn Ergebnis den VektorPlatzhalter enthält, soll nichts ersetzt werden.
@@ -2158,7 +2193,7 @@ Public Class frmIndex
                 If oSqlResult <> String.Empty Then
                     _Logger.Debug("oSqlResult after Replace [" & oSqlResult & "]")
                 End If
-                ' Ergebnis: Es wurden alle einfachen Platzhalter ersetzt, jetzt haben wir einen SQL Befehl, 
+                ' Ergebnis: Es wurden alle einfachen Platzhalter ersetz't, jetzt haben wir einen SQL Befehl, 
                 ' der nur noch vektorfelder-platzhalter enthält   
 
                 ' 2. Schritt: Vektorfelder ersetzen
@@ -2172,7 +2207,7 @@ Public Class frmIndex
                         Dim oOptionalIndex = False
                         Dim oManualIndexResult As String = Nothing
 
-                        oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True)
+                        oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')")
                         oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex)
 
                         Dim oVectorIndexValues = oManualIndexResult.Split(ClassConstants.VECTORSEPARATOR).ToList()
@@ -2241,7 +2276,7 @@ Public Class frmIndex
             _Logger.Debug("Manuelle Indexe geladen")
 
             If MyDataset.VWDDINDEX_MAN.Rows.Count > 0 Then
-                Dim oDokart As DocType = ComboboxDoctype.SelectedItem
+                Dim oDokart As DocType = ComboboxDoctype.EditValue
 
                 CURRENT_DOKART_ID = oDokart.Guid
                 If CheckWrite_IndexeMan(oDokart.Guid) = True Then
@@ -2260,10 +2295,10 @@ Public Class frmIndex
                             'Die Datei verschieben
                             If Move_File2_Target() = True Then
                                 _Logger.Debug(" ...Move_File2_Target durchlaufen")
-                                CURRENT_LASTDOKART = oDokart.Name
+
                                 _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
                                 Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID
-                                ClassDatabase.Execute_non_Query(oDEL, True)
+                                DATABASE_ECM.ExecuteNonQuery(oDEL)
 
                                 If CURR_DELETE_ORIGIN = True Then
                                     _Logger.Info("Datei [" & CURRENT_WORKFILE & "] wird gelöscht.")
@@ -2328,7 +2363,7 @@ Public Class frmIndex
     '        'Die erste Datei indexieren
     '        If WORK_FILE() = True Then
     '            'Und nun die folgenden
-    '            Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+    '            Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
     '            If Not DTFiles2Work Is Nothing Then
     '                Dim err = False
     '                For Each filerow As DataRow In DTFiles2Work.Rows
@@ -2375,7 +2410,7 @@ Public Class frmIndex
         Dim oError As Boolean
         Try
             Dim oSQL As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID
-            Dim oFolderForIndex = ClassDatabase.Execute_Scalar(oSQL, MyConnectionString, True)
+            Dim oFolderForIndex = DATABASE_ECM.GetScalarValue(oSQL)
             If Not IsDBNull(oFolderForIndex) Then
                 CreateFolderForIndex(oFolderForIndex)
             Else
@@ -2405,20 +2440,20 @@ Public Class frmIndex
                             Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}"
 
                             Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{tempCur_WF}','{tempCur_New_FN}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')"
-                            ClassDatabase.Execute_Scalar(Insert_String, MyConnectionString, True)
+                            DATABASE_ECM.GetScalarValue(Insert_String)
                             If DropType.Contains("MSG") Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
                                 If CURRENT_MESSAGEID <> "" Then
                                     Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY"
-                                    Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True)
+                                    Dim GUID = DATABASE_ECM.GetScalarValue(max)
                                     Try
                                         If GUID > 0 Then
                                             Dim sqlUpdate As String
                                             If DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
                                                 sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
-                                                ClassDatabase.Execute_non_Query(sqlUpdate, True)
+                                                DATABASE_ECM.ExecuteNonQuery(sqlUpdate)
                                             Else
                                                 sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
-                                                ClassDatabase.Execute_non_Query(sqlUpdate, True)
+                                                DATABASE_ECM.ExecuteNonQuery(sqlUpdate)
                                             End If
                                         End If
                                     Catch ex As Exception
@@ -2484,7 +2519,7 @@ Public Class frmIndex
                     'Manueller Indexwert
                         Case "M"
                             Dim oManIndexName = oMatch.Value.Substring(3, oMatch.Value.Length - 4)
-                            Dim oIsOptional As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')", MyConnectionString, True)
+                            Dim oIsOptional As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')")
                             _Logger.Info("Versuch den Indexwert aus '" & oManIndexName & "' auszulesen.")
                             Dim oManIndexValue As String = GetManIndex_Value(oManIndexName, "FILE", oIsOptional)
                             _Logger.Info("Ergebnis/Wert für neuen Ordner: '" & oManIndexName & "'")
@@ -2616,7 +2651,7 @@ Public Class frmIndex
                     Else
                         MsgBox("Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)", MsgBoxStyle.Information)
                     End If
-                    CancelAttempts = CancelAttempts + 1
+                    CancelAttempts += 1
                 Case 1
                     Dim result As MsgBoxResult
                     If USER_LANGUAGE = LANG_DE Then
@@ -2631,7 +2666,7 @@ Public Class frmIndex
                             ABORT_INDEXING = True
                             Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
 
-                            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+                            Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql)
 
 
                             Dim anz = DT.Rows.Count
@@ -2651,7 +2686,7 @@ Public Class frmIndex
                                 End If
                             Next
                             'Zuerst die Daten des Ablaufs löschen
-                            If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then
+                            If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then
                                 If containsfw_file = True Then
                                     If USER_LANGUAGE = LANG_DE Then
                                         MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:")
@@ -2702,85 +2737,74 @@ Public Class frmIndex
     End Sub
 
     Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        ClearError()
-        ClearNotice()
+        Try
+            ClearError()
+            ClearNotice()
 
-        Me.Cursor = Cursors.WaitCursor
-        ClassHelper.Refresh_RegexTable()
-        For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
-            If rowregex.Item("FUNCTION_NAME") = "CLEAN_FILENAME" Then
-                REGEX_CLEAN_FILENAME = rowregex.Item("REGEX")
-            End If
-        Next
-        If checkMultiindex.Visible = True And checkMultiindex.Checked = True Then
-            'Die erste Datei indexieren
-            If WORK_FILE() = True Then
-                'Und nun die folgenden
-                Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
-                If Not DTFiles2Work Is Nothing Then
-                    Dim err = False
-                    For Each filerow As DataRow In DTFiles2Work.Rows
-                        CURRENT_WORKFILE_GUID = filerow.Item("GUID")
-                        CURRENT_WORKFILE = filerow.Item("FILENAME2WORK")
-                        CURRENT_WORKFILE_HASH = NotNull(filerow.Item("FILE_HASH"), "")
-                        DropType = filerow.Item("HANDLE_TYPE")
+            Me.Cursor = Cursors.WaitCursor
+            CURRENT_DT_REGEX = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FUNCTION_REGEX")
+            For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
+                If rowregex.Item("FUNCTION_NAME") = "CLEAN_FILENAME" Then
+                    REGEX_CLEAN_FILENAME = rowregex.Item("REGEX")
+                End If
+            Next
+            If checkMultiindex.Visible = True And checkMultiindex.Checked = True Then
+                'Die erste Datei indexieren
+                If WORK_FILE() = True Then
+                    'Und nun die folgenden
+                    Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+                    If DTFiles2Work IsNot Nothing Then
+                        Dim err = False
+                        For Each filerow As DataRow In DTFiles2Work.Rows
+                            CURRENT_WORKFILE_GUID = filerow.Item("GUID")
+                            CURRENT_WORKFILE = filerow.Item("FILENAME2WORK")
+                            CURRENT_WORKFILE_HASH = Utils.NotNull(filerow.Item("FILE_HASH"), "")
+                            DropType = filerow.Item("HANDLE_TYPE")
 
-                        If WORK_FILE() = False Then
-                            err = True
-                            Exit For
+                            If WORK_FILE() = False Then
+                                err = True
+                                Exit For
+                            End If
+                        Next
+                        Me.Cursor = Cursors.Default
+                        If err = False Then
+                            If USER_LANGUAGE = LANG_DE Then
+                                MsgBox("Alle Dateien wurden mit Multiindexing erfolgreich verarbeitet!", MsgBoxStyle.Information, "Erfolgsmeldung:")
+                            Else
+                                MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
+                            End If
+
+                            DocumentViewer1.CloseDocument()
+                            DocumentViewer1.Done()
+
+                            CancelAttempts = 2
+                            Me.Close()
                         End If
-                    Next
+                    End If
+                End If
+            Else
+                If WORK_FILE() = True Then
                     Me.Cursor = Cursors.Default
-                    If err = False Then
+                    If CONFIG.Config.ShowIndexResult = True Then
                         If USER_LANGUAGE = LANG_DE Then
-                            MsgBox("Alle Dateien wurden mit Multiindexing erfolgreich verarbeitet!", MsgBoxStyle.Information, "Erfolgsmeldung:")
+                            MsgBox("Die Datei wurde erfolgreich verarbeitet!" & vbNewLine & "Ablagepfad:" & vbNewLine & CURRENT_NEWFILENAME, MsgBoxStyle.Information, "Erfolgsmeldung")
                         Else
-                            MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
+                            MsgBox("File sucessfully processed!" & vbNewLine & "Path:" & vbNewLine & CURRENT_NEWFILENAME, MsgBoxStyle.Information, "Success")
                         End If
-
-                        DocumentViewer1.CloseDocument()
-                        DocumentViewer1.Done()
-
-                        CancelAttempts = 2
-                        Me.Close()
                     End If
+
+                    DocumentViewer1.CloseDocument()
+                    DocumentViewer1.Done()
+
+                    CancelAttempts = 2
+                    Me.Close()
                 End If
             End If
-        Else
-            If WORK_FILE() = True Then
-                Me.Cursor = Cursors.Default
-                If CONFIG.Config.ShowIndexResult = True Then
-                    If USER_LANGUAGE = LANG_DE Then
-                        MsgBox("Die Datei wurde erfolgreich verarbeitet!" & vbNewLine & "Ablagepfad:" & vbNewLine & CURRENT_NEWFILENAME, MsgBoxStyle.Information, "Erfolgsmeldung")
-                    Else
-                        MsgBox("File sucessfully processed!" & vbNewLine & "Path:" & vbNewLine & CURRENT_NEWFILENAME, MsgBoxStyle.Information, "Success")
-                    End If
-                End If
-
-                DocumentViewer1.CloseDocument()
-                DocumentViewer1.Done()
-
-                CancelAttempts = 2
-                Me.Close()
-            End If
-        End If
-
-        ' Clear all temp files after indexing
-        Clear_Tempfiles()
-        EMAIL.Clear_TempFiles()
-
-        Me.Cursor = Cursors.Default
-    End Sub
-
-    Private Sub Clear_Tempfiles()
-        'TempDateien löschen
-        For Each oFile In TEMP_FILES
-            Try
-                System.IO.File.Delete(oFile)
-            Catch ex As Exception
-                LOGGER.Error(ex)
-            End Try
-        Next
+        Catch ex As Exception
+            MsgBox("Uncaught error while indexing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
+        Finally
+            Me.Cursor = Cursors.Default
+        End Try
     End Sub
 
     Private Sub checkItemPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemPreview.CheckedChanged
@@ -2814,7 +2838,7 @@ Public Class frmIndex
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}", True)
+        DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}")
 
         CancelAttempts = 2
         Close()

Global_Indexer/frmIndexFileList.resx

@@ -405,7 +405,7 @@ Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhinde
     <value>647, 392</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;CheckedListBoxControl1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -414,7 +414,7 @@ Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhinde
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CheckedListBoxControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <metadata name="TBGI_FILES_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>357, 17</value>

Global_Indexer/frmIndexFileList.vb

@@ -82,7 +82,7 @@ Public Class frmIndexFileList
                     End If
 
                     LOGGER.Debug("Removing file from user files: [{0}]", oFilePath)
-                    ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oGuid, True)
+                    DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oGuid)
                 End If
             Next
 
@@ -119,7 +119,7 @@ Public Class frmIndexFileList
     Private Sub frmIndexFileList_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
         If DialogResult = DialogResult.Cancel Then
             Try
-                ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True)
+                DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
             Catch ex As Exception
                 MsgBox("Error while deleting User Files: " & ex.Message, MsgBoxStyle.Critical, Text)
                 LOGGER.Error(ex)

Global_Indexer/frmLicense.vb

@@ -1,7 +1,6 @@
 Imports System.Resources
-Imports DLLLicenseManager
+
 Public Class frmLicense
-    Public _lizenzManager As ClassLicenseManager
     Private LocRM As ResourceManager
     Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click
         If Me.txtPW.Text <> "" Then
@@ -25,10 +24,10 @@ Public Class frmLicense
         Try
             If Me.txtNewlicences.Text <> "" And txtProfile.Text <> "" Then
                 'Encode the license
-                Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtProfile.Text & "#" & txtHotKey.Text, "#DigitalData35452!#")
+                Dim result As String = ClassLicence.LicenseManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtProfile.Text & "#" & txtHotKey.Text, "#DigitalData35452!#")
                 txtlicensekey.Text = result
                 Dim sql As String = "UPDATE TBGI_CONFIGURATION SET LICENSEKEY = '" & result & "' where guid = 1"
-                If ClassDatabase.Execute_non_Query(sql, True) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(sql) = True Then
                     Refresh_Licence(True)
                 End If
 
@@ -41,11 +40,10 @@ Public Class frmLicense
     Sub Refresh_Licence(Neu As Boolean)
         Dim lizenzzahl As Integer
         Try
-            Me._lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
             Dim sql As String = "SELECT LICENSEKEY FROM TBGI_CONFIGURATION WHERE GUID = 1"
 
-            Dim lic As String = ClassDatabase.Execute_Scalar(sql, MyConnectionString)
-            Dim licString = Me._lizenzManager.DecodeLicenseKey(lic)
+            Dim lic As String = DATABASE_ECM.GetScalarValue(sql)
+            Dim licString = ClassLicence.LicenseManager.DecodeLicenseKey(lic)
 
             Dim split() = licString.ToString.Split("#")
 

Global_Indexer/frmNamenkonvention.vb

@@ -28,7 +28,7 @@
     Private Sub frmNamenkonvention_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1"
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql)
             For Each row As DataRow In DT.Rows
                 FILE_DELIMITER = row.Item("FILE_DELIMITER")
                 VERSION_DELIMITER = row.Item("VERSION_DELIMITER")

Global_Indexer/frmSQLConfigAutoIndex.vb

@@ -26,15 +26,17 @@ Public Class SQLConfigAutoIndex
                 End If
             Next
 
-            Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
+            Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & conid)
             Dim dt As DataTable
             If typeCS.Length > 0 Then
                 Dim CS As String
-                CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue)
+                CS = DATABASE_ECM.Get_ConnectionStringforID(cmbConnection.SelectedValue)
                 If typeCS.ToUpper = "Oracle".ToUpper Then
-                    dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True)
+                    LOGGER.Warn("Oracle is not supported!")
+                    'dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True)
                 Else
-                    dt = ClassDatabase.Return_Datatable_CS(query, CS, True)
+                    'dt = ClassDatabase.Return_Datatable_CS(query, CS, True)
+                    dt = DATABASE_ECM.GetDatatableWithConnection(query, CS)
                 End If
             End If
 
@@ -127,7 +129,7 @@ Public Class SQLConfigAutoIndex
             Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION)
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
+            Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
             If DT.Rows.Count = 1 Then
                 Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID")
                 SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT")
@@ -151,17 +153,17 @@ Public Class SQLConfigAutoIndex
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnsave.Click
         Try
-            Dim origresultstring = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, MyConnectionString, True)
-            'Dim origConnection = ClassDatabase.Execute_Scalar("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True)
+            Dim origresultstring = DATABASE_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
+            'Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True)
             'If origConnection Is DBNull Then
 
             'End If
             Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''")
             If insresultstring <> origresultstring Then
                 Dim cmd As String
-                cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" & _
+                cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" &
                 Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXAUTO
-                If ClassDatabase.Execute_non_Query(cmd, True) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then
                     If USER_LANGUAGE = "de-DE" Then
                         lblSave.Text = "SQL-Daten gespeichert - " & Now
                     Else
@@ -207,7 +209,8 @@ Public Class SQLConfigAutoIndex
             End If
         End If
     End Sub
-    Dim AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+
+    ReadOnly AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
 
     Private Sub SQL_ERGEBNISTextBox_KeyUp(sender As Object, e As KeyEventArgs) Handles SQL_ERGEBNISTextBox.KeyUp
         CurrentPosition = SQL_ERGEBNISTextBox.SelectionStart
@@ -234,7 +237,6 @@ Public Class SQLConfigAutoIndex
         End Set
     End Property
     Private Sub CheckForPlaceholders()
-        Dim count As Integer = 0
         Dim text As String = Me.Value
         Dim atPlaceholderRegex = New Regex(AtPlaceholderPattern, RegexOptions.IgnoreCase)
         Dim matches As MatchCollection = atPlaceholderRegex.Matches(text)
@@ -320,26 +322,28 @@ Public Class SQLConfigAutoIndex
                 type = "'VIEW'"
             End If
 
-            Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
+            Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
             Dim dt As DataTable
             If typeCS.Length > 0 Then
-                Dim SQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
+                Dim oSQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
                 Dim CS As String
-                CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue)
+                CS = DATABASE_ECM.Get_ConnectionStringforID(cmbConnection.SelectedValue)
                 If typeCS.ToUpper = "Oracle".ToUpper Then
 
 
-                    If type = "'VIEW'" Then
-                        'DB-Abfrage für alle Views definieren 
-                        SQL = "select VIEW_NAME from USER_VIEWS"
-                    Else
-                        'DB-Abfrage für alle Tables definieren 
-                        SQL = "select TABLE_NAME from USER_TABLES"
-                    End If
-                    dt = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
+                    'If type = "'VIEW'" Then
+                    '    'DB-Abfrage für alle Views definieren 
+                    '    oSQL = "select VIEW_NAME from USER_VIEWS"
+                    'Else
+                    '    'DB-Abfrage für alle Tables definieren 
+                    '    oSQL = "select TABLE_NAME from USER_TABLES"
+                    'End If
+                    'dt = ClassDatabase.Oracle_Return_Datatable(oSQL, CS, True)
+                    LOGGER.Warn("Oracle is not supported!")
                 Else
-                    SQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
-                    dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
+                    oSQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
+                    'dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
+                    dt = DATABASE_ECM.GetDatatableWithConnection(oSQL, CS)
                 End If
                 If dt IsNot Nothing Then
                     cmbFromTables.Items.Clear()
@@ -360,16 +364,18 @@ Public Class SQLConfigAutoIndex
     Private Sub GetColumns(tableName As String, ByRef combobox As ComboBox)
         Try
             Dim CS As String
-            CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue)
-            Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
+            CS = DATABASE_ECM.Get_ConnectionStringforID(cmbConnection.SelectedValue)
+            Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
             Dim SQL As String
             Dim DT As DataTable
             If typeCS.ToUpper = "Oracle".ToUpper Then
-                SQL = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & tableName & "' order by COLUMN_NAME"
-                DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
+                'SQL = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & tableName & "' order by COLUMN_NAME"
+                'DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
+                LOGGER.Warn("Oracle is not supported!")
             Else
                 SQL = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & tableName & "') ORDER BY name"
-                DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
+                'DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
+                DT = DATABASE_ECM.GetDatatableWithConnection(SQL, CS)
             End If
 
             If DT IsNot Nothing Then

Global_Indexer/frmSQLSuggestion.vb

@@ -1,6 +1,5 @@
 Imports Oracle.ManagedDataAccess.Client
 Public Class frmSQLSuggestion
-    Dim isinsert As Boolean = False
     Private Sub btnVorschlag_Click(sender As Object, e As EventArgs) Handles btnVorschlag.Click
         TestSQL(cmbConnection.SelectedValue, SQL_ERGEBNISTextBox.Text)
     End Sub
@@ -10,10 +9,10 @@ Public Class frmSQLSuggestion
 
             Dim i As Integer
 
-            connectionString = ClassFormFunctions.GetConnectionString(conid)
+            connectionString = DATABASE_ECM.Get_ConnectionStringforID(conid)
             If connectionString <> "" Then
                 If connectionString.Contains("Initial Catalog=") Then
-                    'Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_Vorschlag)
+                    'Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql_Vorschlag)
                     'If DT Is Nothing = False Then
                     '    Dim y As Integer = 0
                     '    For Each row As DataRow In DT.Rows
@@ -100,13 +99,11 @@ Public Class frmSQLSuggestion
             'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
             Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION)
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN)
+            Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN)
             If DT.Rows.Count = 1 Then
                 Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID")
                 SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT")
                 SQL_UEBERPRUEFUNGTextBox.Text = DT.Rows(0).Item("SQL_CHECK")
-            Else
-                isinsert = True
             End If
             lblSave.Visible = False
         Catch ex As Exception
@@ -128,10 +125,10 @@ Public Class frmSQLSuggestion
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Try
-            ClassDatabase.Init()
-            Dim origresultstring = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True)
-            Dim origcheckstring = ClassDatabase.Execute_Scalar("SELECT SQL_CHECK FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True)
-            Dim origConnection = ClassDatabase.Execute_Scalar("SELECT CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True)
+            'ClassDatabase.Init()
+            Dim origresultstring = DATABASE_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN)
+            Dim origcheckstring = DATABASE_ECM.GetScalarValue("SELECT SQL_CHECK FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN)
+            Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN)
             Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''")
             Dim inscheckstring = SQL_UEBERPRUEFUNGTextBox.Text.Replace("'", "''")
             If insresultstring <> origresultstring Or _
@@ -139,7 +136,7 @@ Public Class frmSQLSuggestion
                 Dim cmd As String
                 cmd = "UPDATE TBDD_INDEX_MAN SET CONNECTION_ID = " & cmbConnection.SelectedValue & ",SQL_RESULT = '" & insresultstring & "',SQL_CHECK = '" & inscheckstring & "',CHANGED_WHO = '" & _
                     Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXMAN
-                If ClassDatabase.Execute_non_Query(cmd, True) = True Then
+                If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then
                     If USER_LANGUAGE = "de-DE" Then
                         lblSave.Text = "SQL-Daten erfolgreich gespeichert - " & Now
                     Else
@@ -166,7 +163,7 @@ Public Class frmSQLSuggestion
 
     Private Sub btnTestNachbearbeitung_Click(sender As Object, e As EventArgs) Handles btnTestNachbearbeitung.Click
         'Die Nachbearbeitungsschritte laden
-        Dim DTNB As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & CURRENT_INDEXMAN & " ORDER BY SEQUENCE")
+        Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & CURRENT_INDEXMAN & " ORDER BY SEQUENCE")
         If DTNB Is Nothing = False Then
             If DTNB.Rows.Count > 0 Then
                 Dim value As String = ClassPostprocessing.Get_Nachbearbeitung_Wert(txtTest_idxMan.Text, DTNB)

Global_Indexer/frmSQL_Admin.resx

@@ -221,8 +221,8 @@
   <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
     <value>Default</value>
   </data>
   <data name="&gt;&gt;Label1.Name" xml:space="preserve">
@@ -452,7 +452,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="txtSQL.Font" type="System.Drawing.Font, System.Drawing">
     <value>Consolas, 9pt</value>
@@ -466,8 +466,8 @@
   <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
     <value>GridView1</value>
   </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
     <value>None</value>
   </data>
   <data name="&gt;&gt;BindingNavigatorPositionItem.Type" xml:space="preserve">
@@ -482,8 +482,8 @@
   <data name="BindingNavigatorSeparator1.Size" type="System.Drawing.Size, System.Drawing">
     <value>6, 25</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
     <value>Center</value>
   </data>
   <data name="&gt;&gt;GridControl1.ZOrder" xml:space="preserve">
@@ -514,7 +514,7 @@
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TextBox1.ZOrder" xml:space="preserve">
     <value>3</value>
@@ -532,7 +532,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;Button1.Name" xml:space="preserve">
     <value>Button1</value>
@@ -589,7 +589,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BindingNavigatorMoveFirstItem.Name" xml:space="preserve">
     <value>BindingNavigatorMoveFirstItem</value>
@@ -754,7 +754,7 @@
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BindingNavigatorMoveLastItem.Name" xml:space="preserve">
     <value>BindingNavigatorMoveLastItem</value>

Global_Indexer/frmSQL_Admin.vb

@@ -8,7 +8,7 @@ Public Class frmSQL_Admin
 
         If txtSQL.Text <> "" Then
             If txtSQL.Text.ToLower.StartsWith("select") Then
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(txtSQL.Text, True)
+                Dim dt As DataTable = DATABASE_ECM.GetDatatable(txtSQL.Text)
                 If Not dt Is Nothing Then
                     XtraTabControl1.SelectedTabPageIndex = 1
                     BindingSource1.DataSource = dt

Global_Indexer/frmSQL_DESIGNER.vb

@@ -66,7 +66,7 @@ Public Class frmSQL_DESIGNER
             'TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
             'TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
 
-            ' CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True)
+            ' CURRENT_DT_SQL_CONFIG_TABLE = DATABASE_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True)
             'If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then
             '    If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then
             '        cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID")
@@ -74,7 +74,7 @@ Public Class frmSQL_DESIGNER
             '    End If
 
             '    Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID)
-            '    Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL, True)
+            '    Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL, True)
             '    cmbControls.DataSource = oDatatable
             '    cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName
             '    cmbControls.Visible = True
@@ -181,7 +181,7 @@ Public Class frmSQL_DESIGNER
 
             Dim connectionString As String
 
-            connectionString = ClassDatabase.Get_ConnectionString(connectionId)
+            connectionString = DATABASE_ECM.Get_ConnectionStringforID(connectionId)
 
             If connectionString <> "" Then
 
@@ -295,7 +295,7 @@ Public Class frmSQL_DESIGNER
 
     Private Sub LoadConnections()
         Try
-            Dim oDatatable As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION")
+            Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_CONNECTION")
 
             cmbConnection.ValueMember = "GUID"
             cmbConnection.DisplayMember = "BEZEICHNUNG"
@@ -315,7 +315,7 @@ Public Class frmSQL_DESIGNER
 
     Private Sub LoadControls()
         Try
-            Dim oDatatable = ClassDatabase.Return_Datatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1")
+            Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1")
 
             cmbControls.ValueMember = "WD_INDEX"
             cmbControls.DisplayMember = "NAME"

Global_Indexer/frmSplash.vb

@@ -7,8 +7,8 @@ Public NotInheritable Class frmSplash
 
     'TODO: Dieses Formular kann einfach als Begrüßungsbildschirm für die Anwendung festgelegt werden, indem Sie zur Registerkarte "Anwendung"
     '  des Projekt-Designers wechseln (Menü "Projekt", Option "Eigenschaften").
-    Private InitSteps As Integer = 5
-    Private bw As New BackgroundWorker()
+    Private ReadOnly InitSteps As Integer = 5
+    Private ReadOnly bw As New BackgroundWorker()
 
     Private Sub frmSplash_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         'Anwendungstitel

Global_Indexer/frmStart.Designer.vb

@@ -36,7 +36,6 @@ Partial Class frmStart
         Me.TimerFolderWatch = New System.Windows.Forms.Timer(Me.components)
         Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components)
         Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
-        Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components)
         Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.LabelMachine = New DevExpress.XtraBars.BarStaticItem()
@@ -119,10 +118,6 @@ Partial Class frmStart
         '
         resources.ApplyResources(Me.NotifyIcon1, "NotifyIcon1")
         '
-        'TimerCheckDroppedFiles
-        '
-        Me.TimerCheckDroppedFiles.Interval = 500
-        '
         'LabelControl1
         '
         Me.LabelControl1.AllowDrop = True
@@ -232,7 +227,6 @@ Partial Class frmStart
     Friend WithEvents NotifyIcon1 As System.Windows.Forms.NotifyIcon
     Friend WithEvents HistoryIndexierteDateienToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents InfoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents TimerCheckDroppedFiles As System.Windows.Forms.Timer
     Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
     Friend WithEvents btnChoosefiles As System.Windows.Forms.Button
     Friend WithEvents OpenFileDialog1 As System.Windows.Forms.OpenFileDialog

Global_Indexer/frmStart.en-US.resx

@@ -405,8 +405,8 @@
         /+AAH/////////////////////////////////////////////8=
 </value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="LabelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="LabelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
     <value>None</value>
   </data>
   <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">

Global_Indexer/frmStart.resx

@@ -121,37 +121,6 @@
     <value>400, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>294, 24</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="MenuStrip1.Text" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 20</value>
-  </data>
-  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
-    <value>Konfiguration</value>
-  </data>
   <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>221, 22</value>
   </data>
@@ -179,9 +148,49 @@
   <data name="InfoToolStripMenuItem.Text" xml:space="preserve">
     <value>Info</value>
   </data>
+  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>108, 20</value>
+  </data>
+  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Konfiguration</value>
+  </data>
+  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>294, 24</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="MenuStrip1.Text" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>515, 17</value>
   </metadata>
+  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
+    <value>133, 17</value>
+  </data>
+  <data name="tslblFW.Text" xml:space="preserve">
+    <value>FolderWatch ist aktiv</value>
+  </data>
+  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 139</value>
   </data>
@@ -206,15 +215,6 @@
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 17</value>
-  </data>
-  <data name="tslblFW.Text" xml:space="preserve">
-    <value>FolderWatch ist aktiv</value>
-  </data>
-  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <metadata name="TimerFolderWatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1072, 17</value>
   </metadata>
@@ -514,14 +514,11 @@
   <data name="NotifyIcon1.Text" xml:space="preserve">
     <value>GlobalIndexer</value>
   </data>
-  <metadata name="TimerCheckDroppedFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>132, 56</value>
-  </metadata>
   <data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 11.25pt</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="LabelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="LabelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
     <value>Vertical</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -547,7 +544,7 @@
     <value>LabelControl1</value>
   </data>
   <data name="&gt;&gt;LabelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;LabelControl1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -950,12 +947,6 @@
   <data name="&gt;&gt;NotifyIcon1.Type" xml:space="preserve">
     <value>System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TimerCheckDroppedFiles.Name" xml:space="preserve">
-    <value>TimerCheckDroppedFiles</value>
-  </data>
-  <data name="&gt;&gt;TimerCheckDroppedFiles.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;OpenFileDialog1.Name" xml:space="preserve">
     <value>OpenFileDialog1</value>
   </data>
@@ -966,31 +957,31 @@
     <value>LabelMachine</value>
   </data>
   <data name="&gt;&gt;LabelMachine.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;LabelUser.Name" xml:space="preserve">
     <value>LabelUser</value>
   </data>
   <data name="&gt;&gt;LabelUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;LabelLoggedIn.Name" xml:space="preserve">
     <value>LabelLoggedIn</value>
   </data>
   <data name="&gt;&gt;LabelLoggedIn.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;LabelVersion.Name" xml:space="preserve">
     <value>LabelVersion</value>
   </data>
   <data name="&gt;&gt;LabelVersion.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonMiniToolbar1.Name" xml:space="preserve">
     <value>RibbonMiniToolbar1</value>
   </data>
   <data name="&gt;&gt;RibbonMiniToolbar1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;MyDataset.Name" xml:space="preserve">
     <value>MyDataset</value>
@@ -1008,6 +999,6 @@
     <value>frmStart</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Global_Indexer/frmStart.vb

@@ -5,273 +5,29 @@ Imports System.Text
 Imports System.Globalization
 Imports System.Threading
 Imports System.Runtime.InteropServices
+Imports DigitalData.Modules.Language
+Imports DigitalData.Modules.Windows
+Imports DigitalData.Modules.License
 
 Public Class frmStart
-    Public _lizenzManager As ClassLicenseManager
-    Dim loaded As Boolean = False
-    Dim WithEvents HotKey As New clsHotkey(Me)
-
-    Private Const mSnapOffset As Integer = 35
+    Public LicenseManager As LicenseManagerLegacy
     Private Const WM_WINDOWPOSCHANGING As Integer = &H46
 
     Private IndexForm As frmIndex
 
-    <StructLayout(LayoutKind.Sequential)>
-    Public Structure WINDOWPOS
-        Public hwnd As IntPtr
-        Public hwndInsertAfter As IntPtr
-        Public x As Integer
-        Public y As Integer
-        Public cx As Integer
-        Public cy As Integer
-        Public flags As Integer
-    End Structure
+    Private FileDrop As FileDrop
+
+    'Private DroppedFiles As List(Of FileDrop.DroppedFile)
 
     Protected Overrides Sub WndProc(ByRef m As Message)
         ' Listen for operating system messages
         Select Case m.Msg
             Case WM_WINDOWPOSCHANGING
-                SnapToDesktopBorder(Me, m.LParam, 0)
+                Window.SnapToDesktopBorder(Me, m.LParam)
         End Select
 
         MyBase.WndProc(m)
     End Sub
-    Public Shared Sub SnapToDesktopBorder(ByVal clientForm _
-           As Form, ByVal LParam As IntPtr, ByVal widthAdjustment As Integer)
-        If clientForm Is Nothing Then
-            ' Satisfies rule: Validate parameters
-            Throw New ArgumentNullException("clientForm")
-        End If
-
-        ' Snap client to the top, left, bottom or right desktop border
-        ' as the form is moved near that border.
-
-        Try
-            ' Marshal the LPARAM value which is a WINDOWPOS struct
-            Dim NewPosition As New WINDOWPOS
-            NewPosition = CType(Runtime.InteropServices.Marshal.PtrToStructure(
-                LParam, GetType(WINDOWPOS)), WINDOWPOS)
-
-            If NewPosition.y = 0 OrElse NewPosition.x = 0 Then
-                Return ' Nothing to do!
-            End If
-
-            ' Adjust the client size for borders and caption bar
-            Dim ClientRect As Rectangle =
-                clientForm.RectangleToScreen(clientForm.ClientRectangle)
-            ClientRect.Width +=
-                SystemInformation.FrameBorderSize.Width - widthAdjustment
-            ClientRect.Height += (SystemInformation.FrameBorderSize.Height +
-                                  SystemInformation.CaptionHeight)
-
-            ' Now get the screen working area (without taskbar)
-            Dim WorkingRect As Rectangle =
-                Screen.GetWorkingArea(clientForm.ClientRectangle)
-
-            ' Left border
-            If NewPosition.x >= WorkingRect.X - mSnapOffset AndAlso
-                NewPosition.x <= WorkingRect.X + mSnapOffset Then
-                NewPosition.x = WorkingRect.X
-            End If
-
-            ' Get screen bounds and taskbar height
-            ' (when taskbar is horizontal)
-            Dim ScreenRect As Rectangle =
-                Screen.GetBounds(Screen.PrimaryScreen.Bounds)
-            Dim TaskbarHeight As Integer =
-                ScreenRect.Height - WorkingRect.Height
-
-            ' Top border (check if taskbar is on top
-            ' or bottom via WorkingRect.Y)
-            If NewPosition.y >= -mSnapOffset AndAlso
-                 (WorkingRect.Y > 0 AndAlso NewPosition.y <=
-                 (TaskbarHeight + mSnapOffset)) OrElse
-                 (WorkingRect.Y <= 0 AndAlso NewPosition.y <=
-                 (mSnapOffset)) Then
-                If TaskbarHeight > 0 Then
-                    NewPosition.y = WorkingRect.Y ' Horizontal Taskbar
-                Else
-                    NewPosition.y = 0 ' Vertical Taskbar
-                End If
-            End If
-
-            ' Right border
-            If NewPosition.x + ClientRect.Width <=
-                 WorkingRect.Right + mSnapOffset AndAlso
-                 NewPosition.x + ClientRect.Width >=
-                 WorkingRect.Right - mSnapOffset Then
-                NewPosition.x = WorkingRect.Right - (ClientRect.Width +
-                                SystemInformation.FrameBorderSize.Width)
-            End If
-
-            ' Bottom border
-            If NewPosition.y + ClientRect.Height <=
-                   WorkingRect.Bottom + mSnapOffset AndAlso
-                   NewPosition.y + ClientRect.Height >=
-                   WorkingRect.Bottom - mSnapOffset Then
-                NewPosition.y = WorkingRect.Bottom - (ClientRect.Height +
-                                SystemInformation.FrameBorderSize.Height)
-            End If
-
-            ' Marshal it back
-            Runtime.InteropServices.Marshal.StructureToPtr(NewPosition,
-                                                           LParam, True)
-        Catch ex As ArgumentException
-        End Try
-    End Sub
-
-    Private Sub frmMain_DragDrop(sender As Object, e As DragEventArgs) Handles MyBase.DragDrop
-        DragDropForm(e)
-    End Sub
-    Sub DragDropForm(e As DragEventArgs)
-        Dim frmCollection = Application.OpenForms
-        If frmCollection.OfType(Of frmIndexFileList).Any Then
-            MsgBox("Please index the active file/mail first!", MsgBoxStyle.Exclamation, "Drag 'n Drop not allowed!")
-            Exit Sub
-        End If
-        'Erstmal alles löschen
-        ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
-        If ClassFileDrop.Drop_File(e) = True Then
-            TimerCheckDroppedFiles.Start()
-        End If
-    End Sub
-
-    Private Sub frmMain_DragEnter(sender As Object, e As DragEventArgs) Handles Me.DragEnter
-        Drag_Enter(sender, e)
-    End Sub
-    Sub Drag_Enter(sender As Object, e As DragEventArgs)
-        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-            e.Effect = DragDropEffects.All
-            ' Console.WriteLine("DragEnter ...DragDrop")
-        ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
-            'handle a message dragged from Outlook
-            e.Effect = DragDropEffects.Copy
-            ' Console.WriteLine("DragEnter ...OutlookMessage")
-        ElseIf e.Data.GetDataPresent("aryFileGroupDescriptor") AndAlso (e.Data.GetDataPresent("FileContents")) Then
-            e.Effect = DragDropEffects.Copy
-            ' Console.WriteLine("DragEnter ...Attachment from Outlook")
-        Else
-            'otherwise, do not handle
-            e.Effect = DragDropEffects.None
-        End If
-    End Sub
-
-    Sub Check_Dropped_Files()
-        Try
-            ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
-
-            For Each oFiledropString As String In ClassFileDrop.files_dropped
-                If oFiledropString IsNot Nothing Then
-                    LOGGER.Info(">> Check Drop-File: " & oFiledropString.ToString)
-                    Dim oLastPipe = oFiledropString.LastIndexOf("|")
-                    Dim oHandleType As String = oFiledropString.Substring(0, oLastPipe + 1)
-                    Dim oFilename As String = oFiledropString.Substring(oLastPipe + 1)
-
-                    If ClassIndexFunctions.CheckDuplicateFiles(oFilename, "Manuelle Ablage", oHandleType) Then
-                        ClassFilehandle.Decide_FileHandle(oFilename, oHandleType)
-                    End If
-                End If
-            Next
-
-            Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')"
-            DTACTUAL_FILES = Nothing
-            DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
-            ABORT_INDEXING = False
-
-            Dim oOnlyFilesFromFilesystem = True
-            For Each oRow As DataRow In DTACTUAL_FILES.Rows
-                If oRow.Item("HANDLE_TYPE") <> "|DROPFROMFSYSTEM|" Then
-                    oOnlyFilesFromFilesystem = False
-                    Exit For
-                End If
-            Next
-
-            If DTACTUAL_FILES.Rows.Count > 1 And oOnlyFilesFromFilesystem = False Then
-                frmIndexFileList.ShowDialog()
-                LOGGER.Debug("Email Indexing Dialog closed, checking for files to be indexed")
-
-                DTACTUAL_FILES = Nothing
-                DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
-            End If
-
-            If DTACTUAL_FILES.Rows.Count = 0 Then
-                LOGGER.Debug("No files to be indexed, aborting!")
-
-                If USER_LANGUAGE = "de-DE" Then
-                    MessageBox.Show("Es wurden keine Dateien für die Indexierung ausgewählt. Der Indexierungsvorgang wird beendet.", Text, MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
-                Else
-                    MessageBox.Show("You did not select any files for indexing. Indexing will be stopped.", Text, MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
-                End If
-            End If
-
-            For Each Filerow As DataRow In DTACTUAL_FILES.Rows
-                Dim oFileString As String = Filerow.Item("FILENAME2WORK")
-                LOGGER.Info("Processing user file {0}", oFileString)
-
-                CURRENT_FILENAME = Filerow.Item("FILENAME2WORK")
-                CURRENT_WORKFILE_GUID = Filerow.Item(0)
-                CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK")
-                CURRENT_WORKFILE_HASH = NotNull(Filerow.Item("FILE_HASH"), "")
-
-                LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE)
-                If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then
-                    Open_IndexDialog()
-                End If
-
-                ' If multi-indexing is active, all files have been indexed by now, so we can leave the loop
-                If MULTIINDEXING_ACTIVE Then
-                    Exit For
-                End If
-            Next
-
-            Show()
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Sub
-
-    Sub Open_IndexDialog()
-        Try
-            Hide()
-            IndexForm.ShowDialog()
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
-        Finally
-            Show()
-        End Try
-    End Sub
-
-    Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        Try
-            If START_INCOMPLETE = False Then
-                Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
-                ClassDatabase.Execute_non_Query(Sql, True)
-            End If
-            ClassWindowLocation.SaveFormLocationSize(Me)
-        Catch ex As Exception
-            MsgBox("Unexpected Error in Closing Application: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-
-        EMAIL.Clear_TempFiles()
-
-        'TempDateien löschen
-        For Each oFile In TEMP_FILES
-            Try
-                System.IO.File.Delete(oFile)
-            Catch ex As Exception
-                LOGGER.Error(ex)
-            End Try
-        Next
-
-        Try
-            IndexForm.DisposeViewer()
-            IndexForm.Dispose()
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
-    End Sub
 
     Public Sub New()
         Dim splash As New frmSplash()
@@ -284,10 +40,13 @@ Public Class frmStart
 
     End Sub
 
+#Region "=== FORM EVENTS ==="
+
     Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load
         Cursor = Cursors.WaitCursor
         Try
             IndexForm = New frmIndex()
+            FileDrop = New FileDrop(LOGCONFIG, "GLOBIX")
 
             'Lizenz abgellaufen, überprüfen ob User Admin ist
             If LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
@@ -328,7 +87,7 @@ Public Class frmStart
                 ToolStripSeparator1.Visible = False
                 AdministrationToolStripMenuItem.Visible = False
             End If
-            ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True)
+            DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
 
             TopMost = True
 
@@ -337,6 +96,299 @@ Public Class frmStart
         End Try
         Cursor = Cursors.Default
     End Sub
+
+    Private Sub frmStart_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        ' SetLanguage()
+        If START_INCOMPLETE = True Then
+            If LICENSE_COUNT = 0 And LICENSE_EXPIRED = True Then
+
+            Else
+                Me.Close()
+            End If
+        Else
+            TimerFolderWatch.Start()
+        End If
+        Opacity = 0.7
+
+        CURRENT_DT_REGEX = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FUNCTION_REGEX")
+
+        Start_Folderwatch()
+        ClassWindowLocation.LoadFormLocationSize(Me, LoadSize:=False)
+        Try
+            Me.LabelControl1.Location = New Point(13, 37)
+        Catch ex As Exception
+            Me.btnChoosefiles.Location = New Point(269, 37)
+        End Try
+    End Sub
+
+    Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        Try
+            If START_INCOMPLETE = False Then
+                Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
+                DATABASE_ECM.ExecuteNonQuery(Sql)
+            End If
+            ClassWindowLocation.SaveFormLocationSize(Me)
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Closing Application: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+
+        Try
+            IndexForm.DisposeViewer()
+            IndexForm.Dispose()
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+    End Sub
+#End Region
+
+#Region "=== DRAG DROP ==="
+
+    Private Sub frmMain_DragDrop(sender As Object, e As DragEventArgs) Handles MyBase.DragDrop
+        DragDropForm(e)
+    End Sub
+
+    Private Sub LabelControl1_DragDrop(sender As Object, e As DragEventArgs) Handles LabelControl1.DragDrop, btnChoosefiles.DragDrop
+        DragDropForm(e)
+    End Sub
+
+    Private Sub frmMain_DragEnter(sender As Object, e As DragEventArgs) Handles Me.DragEnter
+        Drag_Enter(sender, e)
+    End Sub
+
+    Private Sub LabelControl1_DragEnter(sender As Object, e As DragEventArgs) Handles LabelControl1.DragEnter, btnChoosefiles.DragEnter
+        Drag_Enter(sender, e)
+    End Sub
+
+    Sub DragDropForm(e As DragEventArgs)
+        Dim frmCollection = Application.OpenForms
+        If frmCollection.OfType(Of frmIndexFileList).Any Then
+            MsgBox("Please index the active file/mail first!", MsgBoxStyle.Exclamation, "Drag 'n Drop not allowed!")
+            Exit Sub
+        End If
+        'Erstmal alles löschen
+        DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+
+        Dim oDroppedFiles = FileDrop.GetFiles(e)
+        If oDroppedFiles.Count > 0 Then
+            Check_Dropped_Files(oDroppedFiles)
+        End If
+
+        ' TODO: REMOVE
+        'If ClassFileDrop.Drop_File(e) = True Then
+        '    TimerCheckDroppedFiles.Start()
+        'End If
+    End Sub
+
+    Sub Drag_Enter(sender As Object, e As DragEventArgs)
+        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            e.Effect = DragDropEffects.All
+            ' Console.WriteLine("DragEnter ...DragDrop")
+        ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
+            'handle a message dragged from Outlook
+            e.Effect = DragDropEffects.Copy
+            ' Console.WriteLine("DragEnter ...OutlookMessage")
+        ElseIf e.Data.GetDataPresent("aryFileGroupDescriptor") AndAlso (e.Data.GetDataPresent("FileContents")) Then
+            e.Effect = DragDropEffects.Copy
+            ' Console.WriteLine("DragEnter ...Attachment from Outlook")
+        Else
+            'otherwise, do not handle
+            e.Effect = DragDropEffects.None
+        End If
+    End Sub
+
+    Sub Check_Dropped_Files(pDroppedFiles As List(Of FileDrop.DroppedFile))
+        Try
+            DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
+
+            For Each oDroppedFile In pDroppedFiles
+                LOGGER.Info("Checking Dropped File: [{0}]", oDroppedFile.FilePath)
+                Dim oDropType = oDroppedFile.DropType
+                Dim oFileName = oDroppedFile.FilePath
+
+                If ClassIndexFunctions.CheckDuplicateFiles(oFileName, "Manuelle Ablage", oDropType) Then
+                    FILE_HANDLER.Decide_FileHandle(oFileName, oDropType)
+                End If
+            Next
+
+            'For Each oFiledropString As String In ClassFileDrop.FilesDropped
+            '    If oFiledropString IsNot Nothing Then
+            '        LOGGER.Info(">> Check Drop-File: " & oFiledropString.ToString)
+            '        Dim oLastPipe = oFiledropString.LastIndexOf("|")
+            '        Dim oHandleType As String = oFiledropString.Substring(0, oLastPipe + 1)
+            '        Dim oFilename As String = oFiledropString.Substring(oLastPipe + 1)
+
+            '        If ClassIndexFunctions.CheckDuplicateFiles(oFilename, "Manuelle Ablage", oHandleType) Then
+            '            ClassFilehandle.Decide_FileHandle(oFilename, oHandleType)
+            '        End If
+            '    End If
+            'Next
+
+            Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')"
+            DTACTUAL_FILES = Nothing
+            DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
+            ABORT_INDEXING = False
+
+            Dim oOnlyFilesFromFilesystem = True
+            For Each oRow As DataRow In DTACTUAL_FILES.Rows
+                If oRow.Item("HANDLE_TYPE") <> "|DROPFROMFSYSTEM|" Then
+                    oOnlyFilesFromFilesystem = False
+                    Exit For
+                End If
+            Next
+
+            If DTACTUAL_FILES.Rows.Count > 1 And oOnlyFilesFromFilesystem = False Then
+                frmIndexFileList.ShowDialog()
+                LOGGER.Debug("Email Indexing Dialog closed, checking for files to be indexed")
+
+                DTACTUAL_FILES = Nothing
+                DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
+            End If
+
+            If DTACTUAL_FILES.Rows.Count = 0 Then
+                LOGGER.Debug("No files to be indexed, aborting!")
+
+                If USER_LANGUAGE = "de-DE" Then
+                    MessageBox.Show("Es wurden keine Dateien für die Indexierung ausgewählt. Der Indexierungsvorgang wird beendet.", Text, MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
+                Else
+                    MessageBox.Show("You did not select any files for indexing. Indexing will be stopped.", Text, MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
+                End If
+            End If
+
+            For Each Filerow As DataRow In DTACTUAL_FILES.Rows
+                Dim oFileString As String = Filerow.Item("FILENAME2WORK")
+                Dim oFileGuid = Filerow.Item("GUID")
+                Dim oFileHash = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
+                LOGGER.Info("Processing user file {0}", oFileString)
+
+                CURRENT_FILENAME = oFileString
+                CURRENT_WORKFILE_GUID = oFileGuid
+                CURRENT_WORKFILE = oFileString
+                CURRENT_WORKFILE_HASH = oFileHash
+
+                LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE)
+                If IO.File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then
+                    Open_IndexDialog()
+                Else
+                    Throw New FileNotFoundException("Dropped file does not exist anymore!")
+                End If
+
+                ' If multi-indexing is active, all files have been indexed by now, so we can leave the loop
+                If MULTIINDEXING_ACTIVE Then
+                    Exit For
+                End If
+            Next
+
+            Show()
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+
+        Finally
+            ' Clear all temp files after indexing
+            Clear_Tempfiles()
+            EMAIL.Clear_TempFiles()
+            FileDrop.RemoveTempDirectory()
+
+        End Try
+    End Sub
+
+    'Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick
+    '    TimerCheckDroppedFiles.Stop()
+    '    Check_Dropped_Files()
+    'End Sub
+
+    Private Sub btnChoosefiles_Click(sender As Object, e As EventArgs) Handles btnChoosefiles.Click
+        Try
+            Dim oFileName As String
+            Dim oOpenFileDialog As New OpenFileDialog With {
+                .RestoreDirectory = True,
+                .Multiselect = True
+            }
+
+            If oOpenFileDialog.ShowDialog() = DialogResult.OK Then
+                'TODO: REMOVE
+                'ClassFileDrop.FilesDropped.Clear()
+
+                Dim oDroppedFiles As New List(Of FileDrop.DroppedFile)
+
+                For Each oFileName In oOpenFileDialog.FileNames
+                    LOGGER.Info(">> Chosen File: " & oFileName)
+
+                    'TODO: REMOVE
+                    'ClassFileDrop.FilesDropped.Add("|DROPFROMFSYSTEM|" & oFileName)
+
+                    Dim oFile = New FileDrop.DroppedFile(oFileName) With {
+                        .FileFormat = FileDrop.FileFormat.LocalFile
+                    }
+                    oDroppedFiles.Add(oFile)
+                Next
+
+                'TimerCheckDroppedFiles.Start()
+                Check_Dropped_Files(oDroppedFiles)
+            End If
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Choose Files for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+#End Region
+
+#Region "=== MENU ==="
+    Private Sub GlobalIndexerEinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs)
+        Try
+            Me.Hide()
+            frmAdministration.ShowDialog()
+            Me.Show()
+        Catch ex As Exception
+            MsgBox("Fehler in der Administration:" & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text)
+            LOGGER.Error(ex)
+        End Try
+    End Sub
+
+    Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click
+        frmHistory.ShowDialog()
+    End Sub
+
+    Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoToolStripMenuItem.Click
+        Me.TopMost = False
+        frmAbout.ShowDialog()
+        Me.TopMost = True
+    End Sub
+
+    Private Sub AdministrationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AdministrationToolStripMenuItem.Click
+        Try
+            Me.Hide()
+            frmAdministration.ShowDialog()
+            Me.Show()
+        Catch ex As Exception
+            MsgBox("Fehler in der Administration:" & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text)
+            LOGGER.Error(ex)
+        End Try
+    End Sub
+
+    Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GrundeinstellungenToolStripMenuItem.Click
+        Me.TopMost = False
+        frmConfig_Basic.ShowDialog()
+        'Wurde die Sprache in der Konfiguration geändert
+        If LANGUAGE_CHANGED = True Then
+            Try
+                If USER_LANGUAGE = "de-DE" Then
+                    MsgBox("Zur letzendlichen Neukonfiguration der Sprache ist ein Neustart notwendig!", MsgBoxStyle.Information, Text)
+                Else
+                    MsgBox("For the final changing of language, a restart is required!", MsgBoxStyle.Information, Text)
+                End If
+                Application.Restart()
+            Catch ex As Exception
+                LOGGER.Error(ex)
+                MsgBox("Please restart the application manually.", MsgBoxStyle.Information, Text)
+            End Try
+        Else
+            Start_Folderwatch()
+            Me.TopMost = True
+        End If
+    End Sub
+#End Region
+
+#Region "=== FOLDERWATCH ==="
     Sub Start_Folderwatch()
         If CURRENT_FOLDERWATCH = String.Empty Then
             FW_started = False
@@ -378,7 +430,7 @@ Public Class frmStart
                         LOGGER.Info(">> Adding file from Scanfolder after startup:" & oFileName)
 
                         If ClassIndexFunctions.CheckDuplicateFiles(oFileName, "FolderWatch/Scan") Then
-                            ClassFilehandle.Decide_FileHandle(oFileName, oHandleType)
+                            FILE_HANDLER.Decide_FileHandle(oFileName, oHandleType)
                         End If
                     Next oFileName
 
@@ -414,7 +466,7 @@ Public Class frmStart
                         LOGGER.Info(">> Adding file from Folderwatch after startup:" & oFileName)
 
                         If ClassIndexFunctions.CheckDuplicateFiles(oFileName, "FolderWatch/Scan") Then
-                            ClassFilehandle.Decide_FileHandle(oFileName, handleType)
+                            FILE_HANDLER.Decide_FileHandle(oFileName, handleType)
                         End If
                     Next oFileName
                 Else
@@ -432,41 +484,8 @@ Public Class frmStart
 
     End Sub
 
-    Private Sub GlobalIndexerEinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs)
-        Try
-            Me.Hide()
-            frmAdministration.ShowDialog()
-            Me.Show()
-        Catch ex As Exception
-            MsgBox("Fehler in der Administration:" & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text)
-            LOGGER.Error(ex)
-        End Try
-    End Sub
-
-    Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GrundeinstellungenToolStripMenuItem.Click
-        Me.TopMost = False
-        frmConfig_Basic.ShowDialog()
-        'Wurde die Sprache in der Konfiguration geändert
-        If LANGUAGE_CHANGED = True Then
-            Try
-                If USER_LANGUAGE = "de-DE" Then
-                    MsgBox("Zur letzendlichen Neukonfiguration der Sprache ist ein Neustart notwendig!", MsgBoxStyle.Information, Text)
-                Else
-                    MsgBox("For the final changing of language, a restart is required!", MsgBoxStyle.Information, Text)
-                End If
-                Application.Restart()
-            Catch ex As Exception
-                LOGGER.Error(ex)
-                MsgBox("Please restart the application manually.", MsgBoxStyle.Information, Text)
-            End Try
-        Else
-            Start_Folderwatch()
-            Me.TopMost = True
-        End If
-    End Sub
-
     Private Sub TimerFolderWatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderWatch.Tick
-        If ClassDatabase.DatabaseConnectionTimeout = True Then
+        If DATABASE_ECM.DBInitialized = False Then
             TimerFolderWatch.Enabled = False
 
             Dim title = "Critical Error"
@@ -495,7 +514,7 @@ Public Class frmStart
                 If FW_started = True Or CONFIG.Config.FolderWatchScanStarted = True Then
                     'Prüfen ob alle Files abgearbeitet wurden
                     Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
-                    DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
+                    DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
 
                     If DTACTUAL_FILES.Rows.Count > 0 Then
                         ABORT_INDEXING = False
@@ -508,7 +527,7 @@ Public Class frmStart
                             End If
                             Dim FileForWork As String = row.Item(1)
                             LOGGER.Info(">> In Timer Folderwatch - File: " & FileForWork)
-                            Dim fileInUse As Boolean = ClassFilehandle.IsFileInUse(FileForWork)
+                            Dim fileInUse As Boolean = FILE_HANDLER.IsFileInUse(FileForWork)
                             Dim fileexists As Boolean = System.IO.File.Exists(FileForWork)
                             If fileInUse = False Then
                                 If fileexists = True Then
@@ -521,7 +540,7 @@ Public Class frmStart
                                 Else
                                     LOGGER.Info(">> File not existing - Row will be deleted!")
                                     Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
-                                    ClassDatabase.Execute_non_Query(del)
+                                    DATABASE_ECM.ExecuteNonQuery(del)
                                 End If
                             Else
                                 LOGGER.Info(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!")
@@ -544,6 +563,33 @@ Public Class frmStart
             End Try
         End If
     End Sub
+#End Region
+
+    Private Sub Clear_Tempfiles()
+        'TempDateien löschen
+        For Each oFile In FILE_HANDLER.TempFiles
+            Try
+                System.IO.File.Delete(oFile)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+            End Try
+        Next
+    End Sub
+
+    Sub Open_IndexDialog()
+        Try
+            Hide()
+            IndexForm.ShowDialog()
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        Finally
+            Show()
+        End Try
+    End Sub
+
+
+
     Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
         If LICENSE_EXPIRED = True Or LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
             If USER_LANGUAGE = "de-DE" Then
@@ -557,76 +603,8 @@ Public Class frmStart
             TimerClose3Minutes.Stop()
         End If
     End Sub
-    Private Sub frmStart_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        ' SetLanguage()
-        If START_INCOMPLETE = True Then
-            If LICENSE_COUNT = 0 And LICENSE_EXPIRED = True Then
 
-            Else
-                Me.Close()
-            End If
-        Else
-            TimerFolderWatch.Start()
-        End If
-        loaded = True
-        Opacity = 0.7
 
-        ClassHelper.Refresh_RegexTable()
-
-        Start_Folderwatch()
-        ClassWindowLocation.LoadFormLocationSize(Me, LoadSize:=False)
-        Try
-            Me.LabelControl1.Location = New Point(13, 37)
-        Catch ex As Exception
-            Me.btnChoosefiles.Location = New Point(269, 37)
-        End Try
-    End Sub
-
-    Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click
-        frmHistory.ShowDialog()
-    End Sub
-
-    Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoToolStripMenuItem.Click
-        Me.TopMost = False
-        AboutBox1.ShowDialog()
-        Me.TopMost = True
-    End Sub
-
-    Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick
-        TimerCheckDroppedFiles.Stop()
-        Check_Dropped_Files()
-    End Sub
-    Private Sub LabelControl1_DragDrop(sender As Object, e As DragEventArgs) Handles LabelControl1.DragDrop, btnChoosefiles.DragDrop
-        DragDropForm(e)
-    End Sub
-
-    Private Sub LabelControl1_DragEnter(sender As Object, e As DragEventArgs) Handles LabelControl1.DragEnter, btnChoosefiles.DragEnter
-        Drag_Enter(sender, e)
-    End Sub
-
-    Private Sub btnChoosefiles_Click(sender As Object, e As EventArgs) Handles btnChoosefiles.Click
-        Try
-            Dim oFileName As String
-            Dim oOpenFileDialog As New OpenFileDialog With {
-                .RestoreDirectory = True,
-                .Multiselect = True
-            }
-
-            If oOpenFileDialog.ShowDialog() = DialogResult.OK Then
-                Dim i As Integer = 0
-                ClassFileDrop.files_dropped = Nothing
-                For Each oFileName In oOpenFileDialog.FileNames
-                    ReDim Preserve ClassFileDrop.files_dropped(i)
-                    LOGGER.Info(">> Chosen File: " & oFileName)
-                    ClassFileDrop.files_dropped(i) = "|DROPFROMFSYSTEM|" & oFileName
-                    i += 1
-                Next
-                TimerCheckDroppedFiles.Start()
-            End If
-        Catch ex As Exception
-            MsgBox("Unexpected Error in Choose Files for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Sub
 
     Private Sub frmStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
         If e.KeyCode = Keys.F12 Then
@@ -636,14 +614,5 @@ Public Class frmStart
         End If
     End Sub
 
-    Private Sub AdministrationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AdministrationToolStripMenuItem.Click
-        Try
-            Me.Hide()
-            frmAdministration.ShowDialog()
-            Me.Show()
-        Catch ex As Exception
-            MsgBox("Fehler in der Administration:" & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text)
-            LOGGER.Error(ex)
-        End Try
-    End Sub
+
 End Class

Global_Indexer/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="4.7.13" targetFramework="net461" />
 </packages>

SetupVS19/Product.wxs

@@ -2,26 +2,26 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="$(var.ProductName)" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" Language="1031" Codepage="1252">
-    <Package
-      Id="*"
-      Keywords="Installer"
-      Description="$(var.Description)"
-      Comments="$(var.Comments)"
-      Manufacturer="$(var.Manufacturer)"
-      InstallerVersion="100"
-      Languages="1031"
-      Compressed="yes"
-      SummaryCodepage="1252"
-      InstallScope="perMachine"
+	<Product Name="$(var.ProductName)" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" Language="1031" Codepage="1252">
+		<Package
+		  Id="*"
+		  Keywords="Installer"
+		  Description="$(var.Description)"
+		  Comments="$(var.Comments)"
+		  Manufacturer="$(var.Manufacturer)"
+		  InstallerVersion="100"
+		  Languages="1031"
+		  Compressed="yes"
+		  SummaryCodepage="1252"
+		  InstallScope="perMachine"
      />
 
-    <!-- Nicht entfernen! -->
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value="Global Indexer Install" />
+		<!-- Nicht entfernen! -->
+		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
+		<Property Id='DiskPrompt' Value="Global Indexer Install" />
 
-    <!-- UPGRADE -->
-    <!-- 
+		<!-- UPGRADE -->
+		<!-- 
       Bei neuer Version muss die Versionsnummer unter 
       My Project >> Anwendung >> Assemblyinformationen und unter Product/@Version geändert werden.
       Hier die Assemblyversion UND Dateiversion ändern.
@@ -29,281 +29,296 @@
       NICHT den UpdateCode ändern!
       Darf sich NIE MEHR ändern!
     -->
-    <MajorUpgrade
-      AllowDowngrades="no"
-      AllowSameVersionUpgrades="yes"
-      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
+		<MajorUpgrade
+		  AllowDowngrades="no"
+		  AllowSameVersionUpgrades="yes"
+		  DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />
 
-    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="$(var.UpgradeCode)">
-      <UpgradeVersion
-        Minimum="1.0.0" Maximum="99.0.0"
-        Property="PREVIOUSVERSIONSINSTALLED"
-        IncludeMinimum="yes" IncludeMaximum="no" />
-    </Upgrade>
-    <!-- UPGRADE END -->
+		<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+		<Upgrade Id="$(var.UpgradeCode)">
+			<UpgradeVersion
+			  Minimum="1.0.0" Maximum="99.0.0"
+			  Property="PREVIOUSVERSIONSINSTALLED"
+			  IncludeMinimum="yes" IncludeMaximum="no" />
+		</Upgrade>
+		<!-- UPGRADE END -->
 
-    <!-- Legt das Icon fest -->
-    <Icon Id="GlobalIndexer.exe" SourceFile="Global_Indexer.exe"  />
+		<!-- Legt das Icon fest -->
+		<Icon Id="GlobalIndexer.exe" SourceFile="Global_Indexer.exe"  />
 
-    <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
-    <Property Id="ARPPRODUCTICON" Value="GlobalIndexer.exe" />
+		<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
+		<Property Id="ARPPRODUCTICON" Value="GlobalIndexer.exe" />
 
-    <!-- Liest den Installationsort über die Registry aus -->
-    <Property Id="INSTALLDIR">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
-    </Property>
+		<!-- Liest den Installationsort über die Registry aus -->
+		<Property Id="INSTALLDIR">
+			<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+		</Property>
 
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="DDDIR" Name="$(var.Manufacturer)">
-          <Directory Id="INSTALLDIR" Name="$(var.ProductName)">
-            <Directory Id="LOCALE_DE" Name="de"></Directory>
-            <Directory Id="LOCALE_DE_DE" Name="de-DE"></Directory>
-            <Directory Id="LOCALE_EN" Name="en"></Directory>
-            <Directory Id="LOCALE_EN_US" Name="en-US"></Directory>     
-          </Directory>
-        </Directory>
-      </Directory>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="DDDIR" Name="$(var.Manufacturer)">
+					<Directory Id="INSTALLDIR" Name="$(var.ProductName)">
+						<Directory Id="LOCALE_DE" Name="de"></Directory>
+						<Directory Id="LOCALE_DE_DE" Name="de-DE"></Directory>
+						<Directory Id="LOCALE_EN" Name="en"></Directory>
+						<Directory Id="LOCALE_EN_US" Name="en-US"></Directory>
+					</Directory>
+				</Directory>
+			</Directory>
 
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
-      </Directory>
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+			</Directory>
 
-      <Directory Id="DesktopFolder" />
-    </Directory>
+			<Directory Id="DesktopFolder" />
+		</Directory>
 
-    <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationShortcut_StartMenu" Guid="f09edfce-71ac-4c79-ae46-8a5ae1a2b84c">
-        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
-             Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
-             WorkingDirectory="INSTALLDIR"/>
-        <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    </DirectoryRef>
+		<DirectoryRef Id="ApplicationProgramsFolder">
+			<Component Id="ApplicationShortcut_StartMenu" Guid="f09edfce-71ac-4c79-ae46-8a5ae1a2b84c">
+				<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
 
-    <DirectoryRef Id="DesktopFolder">
-      <Component Id="ApplicationShortcut_Desktop" Guid="e88a7cdb-00c7-4ecb-864e-d182e099eea2">
-        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
-             Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
-             WorkingDirectory="INSTALLDIR"/>
-        <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    </DirectoryRef>
+		<DirectoryRef Id="DesktopFolder">
+			<Component Id="ApplicationShortcut_Desktop" Guid="e88a7cdb-00c7-4ecb-864e-d182e099eea2">
+				<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
-      </Component>
+		<DirectoryRef Id="INSTALLDIR">
+			<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
+				<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
+			</Component>
 
-      <!-- Die ApplicationIco -->
-      <Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
-        <File Id="ApplicationIco" Name="DD_Icons_ICO_GLOBIX_128.ico" Source="DD_Icons_ICO_GLOBIX_128.ico" KeyPath="yes" />
-        <File Id="ApplicationIco2" Name="DD_Icons_ICO_GLOBIX_1.ico" Source="DD_Icons_ICO_GLOBIX_1.ico" KeyPath="no" />
-      </Component>
+			<!-- Die ApplicationIco -->
+			<Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
+				<File Id="ApplicationIco" Name="DD_Icons_ICO_GLOBIX_128.ico" Source="DD_Icons_ICO_GLOBIX_128.ico" KeyPath="yes" />
+				<File Id="ApplicationIco2" Name="DD_Icons_ICO_GLOBIX_1.ico" Source="DD_Icons_ICO_GLOBIX_1.ico" KeyPath="no" />
+			</Component>
 
-      <!--Digital Data Bibliotheken-->
-      <Component Id="DigitalDataLibs" Guid="e68a6a14-3917-4989-abec-d30c521a3431">
-        <File Id="Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="yes" />
-        <File Id="Globix" Name="DigitalData.GUIs.GlobalIndexer.dll" Source="DigitalData.GUIs.GlobalIndexer.dll" KeyPath="no" />
-        <File Id="Filesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll" KeyPath="no" />
-        <File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
-        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="no" />
-        <File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" />
-        <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" />
-        <File Id="Windream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll" KeyPath="no" />
-        <File Id="Windows" Name="DigitalData.Modules.Windows.dll" Source="DigitalData.Modules.Windows.dll" KeyPath="no" />
-        <File Id="Language" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll" KeyPath="no" />
+			<!--Digital Data Bibliotheken-->
+			<Component Id="DigitalDataLibs" Guid="e68a6a14-3917-4989-abec-d30c521a3431">
+				<File Id="Base" Name="DigitalData.Modules.Base.dll" Source="DigitalData.Modules.Base.dll" KeyPath="no" />
+				<File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
+				<File Id="Database" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll" KeyPath="no" />
+				<File Id="Filesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll" KeyPath="no" />
+				<File Id="Language" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll" KeyPath="no" />
+				<File Id="License" Name="DigitalData.Modules.License.dll" Source="DigitalData.Modules.License.dll" KeyPath="no" />
+				<File Id="Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="yes" />
+				<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
+				<File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />
+				<File Id="Windows" Name="DigitalData.Modules.Windows.dll" Source="DigitalData.Modules.Windows.dll" KeyPath="no" />
+				<File Id="Windream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll" KeyPath="no" />
+				<File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" />
+				<File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" />
+				<File Id="Globix" Name="DigitalData.GUIs.GlobalIndexer.dll" Source="DigitalData.GUIs.GlobalIndexer.dll" KeyPath="no" />
+				<File Id="Encryption" Name="DigitalData.Modules.Encryption.dll" Source="DigitalData.Modules.Encryption.dll" KeyPath="no" />
 
-        <File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
-        <File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />
-      </Component>
+			</Component>
 
-      <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
-        <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
-        <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
-        <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
-        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
-      </Component>
+			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
+				<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
+				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
+				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
+				<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+			</Component>
 
-      <!--Verschiedene Bibliotheken-->
-      <Component Id="MiscLibs" Guid="56bb39d9-101a-411d-8b11-5d4e3a602275">
-        <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="no" />
-        <File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
-      </Component>
+			<!--Verschiedene Bibliotheken-->
+			<Component Id="MiscLibs" Guid="56bb39d9-101a-411d-8b11-5d4e3a602275">
+				<File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="no" />
+				<File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
+			</Component>
 
-      <!--WINDREAM Bibliotheken-->
-      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
-        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
-        <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
-        <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
-      </Component>
+			<!--WINDREAM Bibliotheken-->
+			<Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
+				<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
+				<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
+				<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
+				<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
+			</Component>
 
-      <!-- DEVEXPRESS Bibliotheken -->
-      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-        <File Id="DevExpress.Charts.v19.2.Core" Name="DevExpress.Charts.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Charts.v19.2.Core.dll" KeyPath="yes" />
-        <File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Data.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.DataAccess.v19.2" Name="DevExpress.DataAccess.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.DataAccess.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.DataAccess.v19.2.UI.dll" Name="DevExpress.DataAccess.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.DataAccess.v19.2.UI.dll" KeyPath="no" />
-        <File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Office.v19.2.Core.dll" KeyPath="no"/>
-        <File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Pdf.v19.2.Core.dll" KeyPath="no"/>
-        <File Id="DevExpress.Pdf.v19.2.Drawing" Name="DevExpress.Pdf.v19.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Pdf.v19.2.Drawing.dll" KeyPath="no" />
-        <File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Printing.v19.2.Core.dll" KeyPath="no" />
-        <File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.RichEdit.v19.2.Core.dll" KeyPath="no" />
-        <File Id="DevExpress.Sparkline.v19.2.Core" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Sparkline.v19.2.Core.dll" KeyPath="no" />
-        <File Id="DevExpress.Spreadsheet.v19.2.Core" Name="DevExpress.Spreadsheet.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Spreadsheet.v19.2.Core.dll" KeyPath="no" />
-        <File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Utils.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.Utils.v19.2.UI" Name="DevExpress.Utils.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Utils.v19.2.UI.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraCharts.v19.2" Name="DevExpress.XtraCharts.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraCharts.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraBars.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraEditors.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraGrid.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraNavBar.v19.2" Name="DevExpress.XtraNavBar.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraNavBar.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraPdfViewer.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraPrinting.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraRichEdit.v19.2" Name="DevExpress.XtraRichEdit.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraSpreadsheet.v19.2" Name="DevExpress.XtraSpreadsheet.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraTreeList.v19.2.dll" KeyPath="no" />
-        <File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraLayout.v19.2.dll" KeyPath="no" />
-      </Component>
+			<!-- DEVEXPRESS Bibliotheken -->
+			<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
+				<File Id="DevExpress.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll" KeyPath="yes" />
+				<File Id="DevExpress.CodeParser.v21.2" Name="DevExpress.CodeParser.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.CodeParser.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.Data.Desktop.v21.2" Name="DevExpress.Data.Desktop.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.Desktop.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataAccess.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.DataAccess.v21.2.UI.dll" Name="DevExpress.DataAccess.v21.2.UI.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataAccess.v21.2.UI.dll" KeyPath="no" />
+				<File Id="DevExpress.DataVisualization.v21.2.Core.dll" Name="DevExpress.DataVisualization.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataVisualization.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.Diagram.v21.2.Core.dll" Name="DevExpress.Diagram.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Diagram.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.Images.v21.2.dll" Name="DevExpress.Images.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Images.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.Office.v21.2.Core" Name="DevExpress.Office.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Office.v21.2.Core.dll" KeyPath="no"/>
+				<File Id="DevExpress.Pdf.v21.2.Core" Name="DevExpress.Pdf.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Pdf.v21.2.Core.dll" KeyPath="no"/>
+				<File Id="DevExpress.Pdf.v21.2.Drawing" Name="DevExpress.Pdf.v21.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Pdf.v21.2.Drawing.dll" KeyPath="no" />
+				<File Id="DevExpress.Printing.v21.2.Core" Name="DevExpress.Printing.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Printing.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.RichEdit.v21.2.Core" Name="DevExpress.RichEdit.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.RichEdit.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.RichEdit.v21.2.Export" Name="DevExpress.RichEdit.v21.2.Export.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.RichEdit.v21.2.Export.dll" KeyPath="no" />
+				<File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Sparkline.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.Spreadsheet.v21.2.Core" Name="DevExpress.Spreadsheet.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Spreadsheet.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.TreeMap.v21.2.Core" Name="DevExpress.TreeMap.v21.2.Core.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.TreeMap.v21.2.Core.dll" KeyPath="no" />
+				<File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Utils.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.Utils.v21.2.UI" Name="DevExpress.Utils.v21.2.UI.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Utils.v21.2.UI.dll" KeyPath="no" />
+				<File Id="DevExpress.Xpo.v21.2" Name="DevExpress.Xpo.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Xpo.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraBars.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraCharts.v21.2" Name="DevExpress.XtraCharts.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraCharts.v21.2.Wizard" Name="DevExpress.XtraCharts.v21.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.Wizard.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraDiagram.v21.2" Name="DevExpress.XtraDiagram.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraDiagram.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraEditors.v21.2" Name="DevExpress.XtraEditors.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraEditors.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraGrid.v21.2" Name="DevExpress.XtraGrid.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraGrid.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraLayout.v21.2" Name="DevExpress.XtraLayout.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraLayout.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraNavBar.v21.2" Name="DevExpress.XtraNavBar.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraNavBar.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraPdfViewer.v21.2" Name="DevExpress.XtraPdfViewer.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraPdfViewer.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraPrinting.v21.2" Name="DevExpress.XtraPrinting.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraPrinting.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraRichEdit.v21.2" Name="DevExpress.XtraRichEdit.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraSpreadsheet.v21.2" Name="DevExpress.XtraSpreadsheet.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraTreeList.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraTreeMap.v21.2" Name="DevExpress.XtraTreeMap.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraTreeMap.v21.2.dll" KeyPath="no" />
+				<File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraVerticalGrid.v21.2.dll" KeyPath="no" />
+			</Component>
 
-      <!-- Office-Bibliotheken -->
-      <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
-        <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
-        <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
-      </Component>
+			<!-- Office-Bibliotheken -->
+			<Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
+				<File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
+				<File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
+			</Component>
 
-      <!-- Oracle-Bibliothek -->
-      <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" />
-      </Component>
+			<!-- Oracle-Bibliothek -->
+			<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+				<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" />
+			</Component>
 
-      <Component Id="RegistryKeys" Guid="92d8072d-172e-43e2-93e2-535715eb11ce">
-        <RegistryKey Root="HKLM" Key="Software">
-          <RegistryKey Key="[Manufacturer]">
-            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
-              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
-            </RegistryKey>
-          </RegistryKey>
-        </RegistryKey>
+			<Component Id="RegistryKeys" Guid="92d8072d-172e-43e2-93e2-535715eb11ce">
+				<RegistryKey Root="HKLM" Key="Software">
+					<RegistryKey Key="[Manufacturer]">
+						<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+							<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+						</RegistryKey>
+					</RegistryKey>
+				</RegistryKey>
 
-        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-      </Component>
+				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+			</Component>
 
-      <Directory Id="resources.en" Name="en">
-        <Component Id="GlobalIndexer.Locales.en" Guid="d89b7f9b-337f-4784-8945-13de108e240f">
-          <File Id="Global_Indexer.resources.en" Name="Global_Indexer.resources.dll" Source="en\Global_Indexer.resources.dll"></File>
-          <File Id="LookupGrid.resources.en" Name="DigitalData.Controls.LookupGrid.resources.dll" Source="en\DigitalData.Controls.LookupGrid.resources.dll"></File>
-        </Component>
-      </Directory>
+			<Directory Id="resources.en" Name="en">
+				<Component Id="GlobalIndexer.Locales.en" Guid="d89b7f9b-337f-4784-8945-13de108e240f">
+					<File Id="Global_Indexer.resources.en" Name="Global_Indexer.resources.dll" Source="en\Global_Indexer.resources.dll"></File>
+					<File Id="LookupGrid.resources.en" Name="DigitalData.Controls.LookupGrid.resources.dll" Source="en\DigitalData.Controls.LookupGrid.resources.dll"></File>
+				</Component>
+			</Directory>
 
-      <Directory Id="resources.en_US" Name="en_US">
-        <Component Id="GlobalIndexer.Locales.en_US" Guid="fcb2bdda-a8da-4d65-97d8-c5b9fba4ccb1">
-          <File Id="Global_Indexer.resources.en_US" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
-        </Component>
-      </Directory>
+			<Directory Id="resources.en_US" Name="en_US">
+				<Component Id="GlobalIndexer.Locales.en_US" Guid="fcb2bdda-a8da-4d65-97d8-c5b9fba4ccb1">
+					<File Id="Global_Indexer.resources.en_US" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
+				</Component>
+			</Directory>
 
-      <Directory Id="resources.de" Name="de">
-        <Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
-          <File Id="Global_Indexer.resources.de_DE" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
-        </Component>
+			<Directory Id="resources.de" Name="de">
+				<Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
+					<File Id="Global_Indexer.resources.de_DE" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
+				</Component>
 
-        <Component Id="Devexpress.Locales.de" Guid="6be5ff05-af76-4249-862a-5b13e3c56c2a">
-          <File Id="DevExpress.Data.v19.2.resources" Name="DevExpress.Data.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Data.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.DataAccess.v19.2.resources" Name="DevExpress.DataAccess.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.DataAccess.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.DataAccess.v19.2.UI.resources.dll.resources" Name="DevExpress.DataAccess.v19.2.UI.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.DataAccess.v19.2.UI.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Office.v19.2.Core.resources.dll" KeyPath="no"/>
-          <File Id="DevExpress.Pdf.v19.2.Core.resources" Name="DevExpress.Pdf.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Pdf.v19.2.Core.resources.dll" KeyPath="no"/>
-          <File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Printing.v19.2.Core.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.RichEdit.v19.2.Core.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.Sparkline.v19.2.Core.resources" Name="DevExpress.Sparkline.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Sparkline.v19.2.Core.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.Spreadsheet.v19.2.Core.resources" Name="DevExpress.Spreadsheet.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Spreadsheet.v19.2.Core.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Utils.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.Utils.v19.2.UI.resources" Name="DevExpress.Utils.v19.2.UI.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Utils.v19.2.UI.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraCharts.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraBars.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraEditors.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraGrid.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraNavBar.v19.2.resources" Name="DevExpress.XtraNavBar.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraNavBar.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraPdfViewer.v19.2.resources" Name="DevExpress.XtraPdfViewer.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraPdfViewer.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraPrinting.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraSpreadsheet.v19.2.resources" Name="DevExpress.XtraSpreadsheet.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraSpreadsheet.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraTreeList.v19.2.resources.dll" KeyPath="no" />
-          <File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraLayout.v19.2.resources.dll" KeyPath="no" />
-        </Component>
-      </Directory>
-    </DirectoryRef>
+				<Component Id="Devexpress.Locales.de" Guid="6be5ff05-af76-4249-862a-5b13e3c56c2a">
+					<File Id="DevExpress.Data.v21.2.resources" Name="DevExpress.Data.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Data.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.DataAccess.v21.2.resources" Name="DevExpress.DataAccess.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.DataAccess.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.DataAccess.v21.2.UI.resources.dll.resources" Name="DevExpress.DataAccess.v21.2.UI.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.DataAccess.v21.2.UI.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.Office.v21.2.Core.resources" Name="DevExpress.Office.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Office.v21.2.Core.resources.dll" KeyPath="no"/>
+					<File Id="DevExpress.Pdf.v21.2.Core.resources" Name="DevExpress.Pdf.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Pdf.v21.2.Core.resources.dll" KeyPath="no"/>
+					<File Id="DevExpress.Printing.v21.2.Core.resources" Name="DevExpress.Printing.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Printing.v21.2.Core.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.RichEdit.v21.2.Core.resources" Name="DevExpress.RichEdit.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.RichEdit.v21.2.Core.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.Sparkline.v21.2.Core.resources" Name="DevExpress.Sparkline.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Sparkline.v21.2.Core.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.Spreadsheet.v21.2.Core.resources" Name="DevExpress.Spreadsheet.v21.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Spreadsheet.v21.2.Core.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.Utils.v21.2.resources" Name="DevExpress.Utils.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Utils.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.Utils.v21.2.UI.resources" Name="DevExpress.Utils.v21.2.UI.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.Utils.v21.2.UI.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraCharts.v21.2.resources" Name="DevExpress.XtraCharts.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraCharts.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraBars.v21.2.resources" Name="DevExpress.XtraBars.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraBars.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraEditors.v21.2.resources" Name="DevExpress.XtraEditors.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraEditors.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraGrid.v21.2.resources" Name="DevExpress.XtraGrid.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraGrid.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraNavBar.v21.2.resources" Name="DevExpress.XtraNavBar.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraNavBar.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraPdfViewer.v21.2.resources" Name="DevExpress.XtraPdfViewer.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraPdfViewer.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraPrinting.v21.2.resources" Name="DevExpress.XtraPrinting.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraPrinting.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraRichEdit.v21.2.resources" Name="DevExpress.XtraRichEdit.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraSpreadsheet.v21.2.resources" Name="DevExpress.XtraSpreadsheet.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraSpreadsheet.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraTreeList.v21.2.resources" Name="DevExpress.XtraTreeList.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraTreeList.v21.2.resources.dll" KeyPath="no" />
+					<File Id="DevExpress.XtraLayout.v21.2.resources" Name="DevExpress.XtraLayout.v21.2.resources.dll" Source="D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\de\DevExpress.XtraLayout.v21.2.resources.dll" KeyPath="no" />
+				</Component>
+			</Directory>
+		</DirectoryRef>
 
 
-    <!-- Installierte Features -->
-    <Feature Id="Complete" Title="Main Application" Level="1">
-      <ComponentRef Id="MainApplicationExe" />
-      <ComponentRef Id="WindreamLibs" />
-      <ComponentRef Id="DigitalDataLibs" />
-      <ComponentRef Id="MiscLibs" />
-      <ComponentRef Id="Microsoft.Office" />
-      <ComponentRef Id="Oracle" />
-      <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="GDPictureLibs" />
-      <ComponentRef Id="RegistryKeys"/>
-      <ComponentRef Id="ApplicationIco"/>
-      <ComponentRef Id="GlobalIndexer.Locales.de" />
-      <ComponentRef Id="GlobalIndexer.Locales.en" />
-      <ComponentRef Id="GlobalIndexer.Locales.en_US" />
-      <ComponentRef Id="Devexpress.Locales.de" />
-    </Feature>
+		<!-- Installierte Features -->
+		<Feature Id="Complete" Title="Main Application" Level="1">
+			<ComponentRef Id="MainApplicationExe" />
+			<ComponentRef Id="WindreamLibs" />
+			<ComponentRef Id="DigitalDataLibs" />
+			<ComponentRef Id="MiscLibs" />
+			<ComponentRef Id="Microsoft.Office" />
+			<ComponentRef Id="Oracle" />
+			<ComponentRef Id="DevExpressLibs" />
+			<ComponentRef Id="GDPictureLibs" />
+			<ComponentRef Id="RegistryKeys"/>
+			<ComponentRef Id="ApplicationIco"/>
+			<ComponentRef Id="GlobalIndexer.Locales.de" />
+			<ComponentRef Id="GlobalIndexer.Locales.en" />
+			<ComponentRef Id="GlobalIndexer.Locales.en_US" />
+			<ComponentRef Id="Devexpress.Locales.de" />
+		</Feature>
 
-    <Feature Id="DesktopShortcut" Title="Desktop Shortcut">
-      <Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
-      <ComponentRef Id="ApplicationShortcut_Desktop"/>
-    </Feature>
+		<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
+			<Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_Desktop"/>
+		</Feature>
 
-    <Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
-      <Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
-      <ComponentRef Id="ApplicationShortcut_StartMenu" />
-    </Feature>
+		<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
+			<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_StartMenu" />
+		</Feature>
 
-    <!-- Legt das Standard-Installationsverzeichnis fest-->
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-    <Property Id="_BrowseProperty" Value="INSTALLDIR" />
+		<!-- Legt das Standard-Installationsverzeichnis fest-->
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+		<Property Id="_BrowseProperty" Value="INSTALLDIR" />
 
-    <!-- OBERFLÄCHE -->
-    <UI>
-      <!--<UIRef Id="WixUI_InstallDir" />-->
-      <UIRef Id="WixUI_FeatureTree"/>
-      <UIRef Id="WixUI_ErrorProgressText" />
-      <Publish Dialog="WelcomeDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="InstallDirDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Back"
-            Event="NewDialog"
-            Value="WelcomeDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="FeaturesDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="ChangeFolder"
-            Event="NewDialog"
-            Value="BrowseDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="FeaturesDlg"
-              Control="Back"
-              Event="NewDialog"
-              Value="InstallDirDlg"
-              Order="2">1</Publish>
-    </UI>
-  </Product>
+		<!-- OBERFLÄCHE -->
+		<UI>
+			<!--<UIRef Id="WixUI_InstallDir" />-->
+			<UIRef Id="WixUI_FeatureTree"/>
+			<UIRef Id="WixUI_ErrorProgressText" />
+			<Publish Dialog="WelcomeDlg"
+				  Control="Next"
+				  Event="NewDialog"
+				  Value="InstallDirDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="Back"
+				  Event="NewDialog"
+				  Value="WelcomeDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="Next"
+				  Event="NewDialog"
+				  Value="FeaturesDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="ChangeFolder"
+				  Event="NewDialog"
+				  Value="BrowseDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="FeaturesDlg"
+					Control="Back"
+					Event="NewDialog"
+					Value="InstallDirDlg"
+					Order="2">1</Publish>
+		</UI>
+	</Product>
 </Wix>