From 2fcec8d2b6965de661a42a1def33a5a087b1fd0d Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <developer01@didalog.de>
Date: Wed, 17 Apr 2019 17:25:22 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20an=20licenseCount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb | 11 +++++++----
 app/DD_PM_WINDREAM/ClassInit.vb                 |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
index 809fdf7..75cc232 100644
--- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
+++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
@@ -4,27 +4,30 @@ Imports System.IO
 Imports WINDREAMLib
 
 Public Class ClassAllgemeineFunktionen
-    Public Shared Sub LoginOut(LoginOut As String)
+    Public Shared Function LoginOut(LoginorOut As String) As Boolean
         Try
             If USER_EXISTS = False Then
-                Exit Sub
+                Return False
             End If
             Dim Sql As String
-            If LoginOut = "LOGIN" Then
+            If LoginorOut = "LOGIN" Then
                 Sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Process-Manager','{2}','{3}')", USER_ID, 1, My.Application.Info.Version.ToString, Environment.MachineName)
             Else
                 Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Process-Manager')"
             End If
             If ClassDatabase.Execute_non_Query(Sql, True) = True Then
                 LOGGER.Debug(" >> User logged in....", False)
+                Return True
             Else
                 LOGGER.Info(" >> User could not be logged in/out....", False)
+                Return False
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Info("Error in LoginOut: " & ex.Message)
+            Return False
         End Try
-    End Sub
+    End Function
 
     Public Function Insert_LogEntry(PROFIL_ID As String, ERR_MSG As String, USR As String)
         Try
diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb
index 2ed855b..f7b9912 100644
--- a/app/DD_PM_WINDREAM/ClassInit.vb
+++ b/app/DD_PM_WINDREAM/ClassInit.vb
@@ -182,13 +182,15 @@ Public Class ClassInit
                 USER_RIGHT_FILE_DELETE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")
 
                 USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
-                ss
+
                 LOGGER.Debug(" >> User exists....", False)
                 'Am System anmelden
                 Refresh_Licence()
                 'Check_User_Exists_in_PMGroups()
 
-                ClassAllgemeineFunktionen.LoginOut("LOGIN")
+                If ClassAllgemeineFunktionen.LoginOut("LOGIN") = True Then
+                    USERCOUNT_LOGGED_IN += 1
+                End If
 
                 'sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1)
                 '    USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)