MS

app/DD-Record-Organiser/ClassDatabase.vb

@@ -266,7 +266,8 @@ Public Class ClassDatabase
                 SQLconnect.Close()
                 Return result
             Else
-                MsgBox("No ConnectionID!", MsgBoxStyle.Exclamation)
+                MsgBox("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar, MsgBoxStyle.Exclamation)
+                ClassLogger.Add("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar)
                 Return Nothing
             End If
 

app/DD-Record-Organiser/ClassDragDrop.vb

@@ -5,37 +5,29 @@ Public Class ClassDragDrop
     Public Shared files_dropped As String()
     Public Shared Function Drop_File(e As DragEventArgs)
         Try
-            Try
+
             If LogErrorsOnly = False Then ClassLogger.Add(" >> In Drop_File....", False)
             files_dropped = Nothing
 
             Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')"
             ClassDatabase.Execute_non_Query(sql)
 
+
             If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> DataFormats.FileDrop", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Simple File Drop", False)
                 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
-
+                    ClassLogger.Add(">> Simple FileDrop - File: " & MyFiles(i), False)
                     ReDim Preserve files_dropped(i)
                     files_dropped(i) = "@DROPFROMFSYSTEM@" & MyFiles(i)
                     ' ListBox1.Items.Add(MyFiles(i))
                 Next
-                    Return files_dropped
+                Return True
-                End If
+            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
-            Catch ex As Exception
-                MsgBox("Unexpected Error in DropFile||DataFormats.FileDrop: " & ex.Message, MsgBoxStyle.Critical)
-                ClassLogger.Add("Unexpected Error in DataFormats.FileDrop: " & ex.Message, True)
-            End Try
-
-            Try
-                If e.Data.GetDataPresent("FileGroupDescriptor") AndAlso (e.Data.GetDataPresent("FileContents")) Then
-                    Console.WriteLine(">> FileGroupDescriptor/FileContents")
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> FileGroupDescriptor/FileContents", False)
                 '// the first step here is to get the stbFileName
                 '// of the attachment and
                 '// build a full-path name so we can store it
@@ -69,6 +61,7 @@ Public Class ClassDragDrop
                 '// 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
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Drag of Outlook Attachment", False)
                     '// 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
@@ -78,55 +71,65 @@ Public Class ClassDragDrop
                     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 = ClassHelper.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
-                            'MsgBox("Attachment File from Outlook created:" & vbNewLine & strOutFile)
-                            '   lblFile.Text += "Attachment File from Outlook created" + Environment.NewLine
-                            Console.WriteLine(">> Drop of a mailattachment - File")
                         ReDim Preserve files_dropped(0)
-                            files_dropped(0) = "@OUTLOOK_ATTMNT@" & strOutFile
+                        files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile
-                            TEMP_FILES.Add(strOutFile)
                         If LogErrorsOnly = False Then ClassLogger.Add(">> Drop an Attachment - File: " & strOutFile, False)
-                            Return files_dropped
+                        Return True
                     Else
                         ClassLogger.Add(">> Attachment File from Outlook could not be created", False)
-                            'lblFile.Text += "Attachment File from Outlook could not be created" + Environment.NewLine
                     End If
                 End If
             End If
-            Catch ex As Exception
-                MsgBox("Unexpected Error in DropFile||Attachment: " & ex.Message, MsgBoxStyle.Critical)
-                ClassLogger.Add("Unexpected Error in Drop Attachment: " & ex.Message, True)
-            End Try
-
-            Try
             If e.Data.GetDataPresent("FileGroupDescriptor") Then
-                    Console.WriteLine(">> FileGroupDescriptor")
+                Dim oApp
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Drop of OutlookMessage", False)
+                Try
-                    Dim oApp As New Outlook.Application
+                    oApp = New Outlook.Application()
-
+                Catch ex As Exception
+                    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
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Drop of msg", False)
                 'supports a drop of a Outlook message 
                 Dim myobj As Object
-
                 For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
                     myobj = oApp.ActiveExplorer.Selection.Item(i)
-
+                    Dim subj As String = myobj.Subject
-                        'hardcode a destination path for testing
+                    If subj = "" Then
-                        Dim strFile As String = IO.Path.Combine(Path.GetTempPath, (myobj.Subject + ".msg").Replace(":", ""))
+                        subj = "NO_SUBJECT"
-                        myobj.SaveAs(strFile)
-                        TEMP_FILES.Add(strFile)
-                        ReDim Preserve files_dropped(i)
-                        files_dropped(i) = "@OUTLOOKMESSAGE@" & strFile
-                    Next
-                    Return files_dropped
                     End If
+                    If subj.Contains("\") Then
+                        subj = subj.Replace("\", "-")
+                    End If
+                    If subj.Contains("/") Then
+                        subj = subj.Replace("/", "-")
+                    End If
+                    'hardcode a destination path for testing
+                    Dim strFile As String = IO.Path.Combine(Path.GetTempPath, (subj + ".msg").Replace(":", ""))
+                    strFile = strFile.Replace("?", "")
+                    strFile = strFile.Replace("!", "")
+                    strFile = strFile.Replace("%", "")
+                    strFile = strFile.Replace("$", "")
+                    ClassLogger.Add(">> Drop of msg - File:" & strFile, False)
+                    Try
+                        myobj.SaveAs(strFile)
                     Catch ex As Exception
-                MsgBox("Unexpected Error in DropFile||OutlookMessage: " & ex.Message, MsgBoxStyle.Critical)
+                        MsgBox("Error in Save Email2Tempfile" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                ClassLogger.Add("Unexpected Error in Drop OutlookMessage: " & ex.Message, True)
+                        Return False
                     End Try
 
+                    ReDim Preserve files_dropped(i)
+                    files_dropped(i) = "@OUTLOOK_MESSAGE@" & strFile
+                Next
+                Return True
+                'Drop eines Outlook Attachments
+            End If
 
         Catch ex As Exception
             MsgBox("Unexpected Error in Drop_File: " & ex.Message, MsgBoxStyle.Critical)
@@ -137,28 +140,7 @@ Public Class ClassDragDrop
             ReDim Preserve files_dropped(0)
             files_dropped(0) = "@SCAN@" & Wert
         End If
-        'Else
-        '    Dim files() As String = e.Data.GetData(DataFormats.FileDrop)
-        '    Dim filestype() As String
       
-        '    filestype = e.Data.GetData(DataFormats.CommaSeparatedValue)
-        '    Dim sReader As New StreamReader(filestype(0))
-        '    'get the filename from the file without the path
-        '    Dim file_name As String = Path.GetFileName(filestype(0))
-
-        '    'check the extension of the file
-        '    If Path.GetExtension(filestype(0)).ToLower() = ".xml" Then
-        '        'Read the xml file
-        '        For Each path In files
-        '            'ReadXMLFile(path)
-        '        Next
-        '    Else
-        '        'warning about the file type
-        '        MessageBox.Show("Only XML files are supported!", "Warning!", _
-        'MessageBoxButtons.OK, _
-        '    MessageBoxIcon.Warning)
-        '    End If
-        'End If
 
     End Function
     Public Shared Sub Drag_enter(e As DragEventArgs)

app/DD-Record-Organiser/ClassHelper.vb

@@ -50,4 +50,33 @@ Public Class ClassHelper
         End If
         Return inuse
     End Function
+    Public Shared Function Versionierung_Datei(Dateiname As String)
+        Dim extension
+        Dim _NewFileString
+        Try
+            Dim version As Integer = 1
+
+            Dim Stammname As String = Path.GetDirectoryName(Dateiname) & "\" & Path.GetFileNameWithoutExtension(Dateiname)
+            extension = Path.GetExtension(Dateiname)
+
+            Dim _neuername As String = Stammname
+            'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "")
+            'Überprüfen ob File existiert
+            If File.Exists(_neuername & extension) = False Then
+                _NewFileString = _neuername
+            Else
+                Do While File.Exists(_neuername & extension)
+                    version = version + 1
+                    _neuername = Stammname & "~" & version
+                    _NewFileString = _neuername
+                Loop
+            End If
+            Return _NewFileString & extension
+        Catch ex As Exception
+            ClassLogger.Add(" - Error in versioning file - error: " & vbNewLine & ex.Message)
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in versioning file:")
+            Return ""
+        End Try
+
+    End Function
 End Class

app/DD-Record-Organiser/ClassInit.vb

@@ -50,7 +50,7 @@ Public Class ClassInit
 
     End Sub
 
-    Public Sub InitUserLogin()
+    Public Shared Function InitUserLogin()
         Dim sql = sql_UserID
         sql = sql.Replace("@user", Environment.UserName)
         ClassLogger.Add(">> Neuanmeldung am System: " & Now.ToString, False)
@@ -58,10 +58,16 @@ Public Class ClassInit
 
         USER_GUID = ClassDatabase.Execute_Scalar(sql)
         If USER_GUID Is Nothing Then
-            ClassLogger.Add(" - User: " & Environment.UserName & " nicht in der Userverwaltung hinterlegt!", False)
+            ClassLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradminsitration!", False)
             'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
             'Me.Close()
-            Throw New Exception("Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+            Dim msg = String.Format("Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+            If USER_LANGUAGE <> "de-DE" Then
+                msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
+            End If
+            MsgBox(msg, MsgBoxStyle.Exclamation)
+            Return False
         Else
             USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
             Dim DT_CLIENT_USER As DataTable = ClassDatabase.Return_Datatable("SELECT CLIENT_ID FROM TBDD_CLIENT_USER WHERE USER_ID = " & USER_GUID)
@@ -82,7 +88,13 @@ Public Class ClassInit
             If ClassDatabase.Execute_Scalar(sql) = False Then
                 ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False)
                 'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                Throw New Exception("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+                Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("You are not authorized for using this module." & vbNewLine & "Please contact the admin.")
+                End If
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+                Return False
                 'Me.Close()
             Else
                 'Am System anmelden
@@ -115,13 +127,20 @@ Public Class ClassInit
                 '####
 
                 If LICENSE_COUNT < USERS_LOGGED_IN And LICENSE_EXPIRED = False Then
-                    MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERS_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:")
+                    Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_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!")
-                    ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & USERS_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Record-Organizer!", False)
+
+                    If USER_LANGUAGE <> "de-DE" Then
+                        msg = String.Format("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine & _
+                                            "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
+                    End If
+                    MsgBox(msg, MsgBoxStyle.Exclamation)
+                    ClassLogger.Add(" >> The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ", False)
                     If USER_IS_ADMIN = False Then
                         'Anmeldung wieder herausnehmen
                         sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
                         ClassDatabase.Execute_non_Query(sql, True)
-                        ClassLogger.Add(" - Wieder abgemeldet", False)
+                        ClassLogger.Add(" - logged out the user", False)
+                        Return False
                     End If
                 Else
                     Try
@@ -137,6 +156,7 @@ Public Class ClassInit
                         End If
                     Catch ex As Exception
                         ClassLogger.Add("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
+                        Return False
                     End Try
 
                 End If
@@ -145,6 +165,6 @@ Public Class ClassInit
                 'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
             End If
         End If
-    End Sub
+    End Function
 
 End Class

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -3186,9 +3186,11 @@ Public Class frmConstructor_Main
                 End If
             Else
                 CURRENT_RECORD_ID = RECORD_ID
-                ClassDragDrop.Drop_File(e)
+                If ClassDragDrop.Drop_File(e) = True Then
                     Check_Dropped_Files()
                 End If
+
+            End If
         End If
     End Sub
     Sub Check_Dropped_Files()

app/DD-Record-Organiser/frmMain.vb

@@ -60,10 +60,10 @@ Public Class frmMain
         End Try
     End Sub
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Try
         ' Referenz zu frmMain speichern
         MAIN_FORM = Me
-
+        If ERROR_INIT <> "INVALID USER" Then
+            Try
                 ' Form Titel setzen
                 ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain")
                 Dim i = My.Application.UICulture.ToString()
@@ -90,6 +90,10 @@ Public Class frmMain
             Catch ex As Exception
                 MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
+        End If
+
+
+
     End Sub
     Sub Load_Connection_Dep_Data()
         SetBackground()
@@ -105,6 +109,8 @@ Public Class frmMain
             LoadQuickStartItems()
         ElseIf ERROR_INIT = "DATABASE" Then
             Load_ConfigBasic()
+        ElseIf ERROR_INIT = "INVALID USER" Then
+
         End If
         Load_TasksforUser()
     End Sub
@@ -118,6 +124,9 @@ Public Class frmMain
         End Try
     End Sub
     Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        If ERROR_INIT = "INVALID USER" Then
+            Exit Sub
+        End If
         Try
             Dim sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))"
             sql = sql.Replace("@LogInOut", 0)
@@ -450,6 +459,7 @@ Public Class frmMain
     End Sub
 
     Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        If ERROR_INIT <> "INVALID USER" Then
             Refresh_TaskReminder()
             If Task_Popup_minutes <> 0 Then
                 TimerTasks.Start()
@@ -466,7 +476,7 @@ Public Class frmMain
                 If USER_IS_ADMIN = True Then
                     ClassLogger.Add(">> User is Admin - Timer will be started", False)
                     'If USER_LANGUAGE = "de-DE" Then
-                MsgBox("Sie haben nun 3 Minuten Zeit eine neue Lizenz zu vergeben!", MsgBoxStyle.Information)
+                    MsgBox("You now got 3 minutes for creating a new license", MsgBoxStyle.Information)
                     'Else
                     '    MsgBox("You now got 3 minutes to update the license!", MsgBoxStyle.Information)
                     'End If
@@ -477,6 +487,10 @@ Public Class frmMain
                     End If
                 End If
             End If
+        Else
+            Me.Close()
+        End If
+       
         'If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then
         '    If CURRENT_USER_IS_ADMIN = True Then
         '        ClassLogger.Add(">> User is Admin - Timer will be started", False)

app/DD-Record-Organiser/frmSplash.vb

@@ -78,7 +78,9 @@ Public NotInheritable Class frmSplash
             System.Threading.Thread.Sleep(300)
 
             bw.ReportProgress(CalcProgress(4), "Initializing User-Configuration")
-            Init.InitUserLogin()
+            If Init.InitUserLogin = False Then
+                ERROR_INIT = "INVALID USER"
+            End If
 
             System.Threading.Thread.Sleep(500)