Remove ClassDatabase, Replace with Database.MSSQL Module

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)")
@@ -150,12 +150,12 @@ 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)
+                Dim folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID)
                 If Not folderwatch Is 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)
+                Dim SCAN_folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID)
                 If Not SCAN_folderwatch Is Nothing Then
                     CURRENT_SCAN_FOLDERWATCH = SCAN_folderwatch
                 End If
@@ -230,7 +230,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 +262,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
@@ -362,7 +362,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
@@ -401,7 +401,7 @@ Public Class frmConfig_Basic
         Catch ex As Exception
             MsgBox("Unexpected Error in Load_Basics:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
-     
+
     End Sub
     Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click
         Process.Start(ClassLogger.DateiSpeicherort)
@@ -453,7 +453,7 @@ Public Class frmConfig_Basic
     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>", _
+        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
 
@@ -483,7 +483,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