From fd0e907262ef02f22ccfbf0a51e33726ea328264 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 17 Aug 2016 16:02:55 +0200 Subject: [PATCH] MS --- .../frmConfiguration_Basic.vb | 32 +++++++++++-------- .../frmCheckRightsEntity.vb | 2 +- .../frmReworkUsers.vb | 5 +-- app/SetupWiX/Product.wxs | 2 +- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/DD-Record-Organiser/frmConfiguration_Basic.vb b/app/DD-Record-Organiser/frmConfiguration_Basic.vb index b29363d..7228e1c 100644 --- a/app/DD-Record-Organiser/frmConfiguration_Basic.vb +++ b/app/DD-Record-Organiser/frmConfiguration_Basic.vb @@ -142,19 +142,25 @@ Public Class frmConfiguration_Basic End Sub Private Sub btnTest_Anmeldung_Click(sender As Object, e As EventArgs) Handles btnTest_Anmeldung.Click - Dim session = DD_Rights.ClassRights.GetWMSessionAsUser(Me.txtDomäne.Text, Me.txtServername.Text, Me.txtUser.Text, Me.txtPW.Text) - If Not IsNothing(session) Then - MsgBox("The persionalized connection to windream was created successfully!", MsgBoxStyle.Information) - Dim wrapper As New ClassEncryption("!35452didalog=") - Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text) - Dim pw As String = cipherText - - Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName) - ClassDatabase.Execute_non_Query(upd) - btnsave.Enabled = False - Else - MsgBox("The persionalized connection to windream could NOT be created." & vbNewLine & "Please check the User-Data!", MsgBoxStyle.Critical) - End If + Try + DD_Rights.ClassLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) + Dim session = DD_Rights.ClassRights.GetWMSessionAsUser(Me.txtDomäne.Text, Me.txtServername.Text, Me.txtUser.Text, Me.txtPW.Text) + If Not IsNothing(session) Then + MsgBox("The persionalized connection to windream was created successfully!", MsgBoxStyle.Information) + Dim wrapper As New ClassEncryption("!35452didalog=") + Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text) + Dim pw As String = cipherText + + Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName) + ClassDatabase.Execute_non_Query(upd) + btnsave.Enabled = False + Else + MsgBox("The persionalized connection to windream could NOT be created." & vbNewLine & "Please check the User-Data!", MsgBoxStyle.Critical) + End If + Catch ex As Exception + MsgBox("Error in Check windream login: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Private Sub txtDomäne_TextChanged(sender As Object, e As EventArgs) Handles txtDomäne.TextChanged diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb index 6a9c138..7048571 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb @@ -1,4 +1,4 @@ -Imports DD_Rights +Imports DD Imports System.ComponentModel Public Class frmCheckRightsEntity diff --git a/app/RecordOrganizer_RightManager/frmReworkUsers.vb b/app/RecordOrganizer_RightManager/frmReworkUsers.vb index 67a4fdc..12bf3ae 100644 --- a/app/RecordOrganizer_RightManager/frmReworkUsers.vb +++ b/app/RecordOrganizer_RightManager/frmReworkUsers.vb @@ -7,6 +7,7 @@ Public Class frmReworkUsers Private GUID_WORKING As Integer = 0 Private COUNT_ENTITIES As Integer = 0 Private ENTITIES_WORKED As Integer = 0 + Private CURR_ENTITY As Integer = 0 Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load Refresh_Combo() End Sub @@ -39,6 +40,7 @@ Public Class frmReworkUsers Dim DT_ENTITY As DataTable = ClassDatabase.Return_Datatable(sql) COUNT_ENTITIES = DT_ENTITY.Rows.Count For Each row As DataRow In DT_ENTITY.Rows + CURR_ENTITY = row.Item("ENTITY_ID") sql = String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {0}) AND ENTITY_ID = {1}", ECM_USER_ID, row.Item("ENTITY_ID")) DT_FILES = ClassDatabase.Return_Datatable(sql) If DD_Rights.ClassRights.Init(row.Item("ENTITY_ID"), chklogging.Checked, DT_FILES.Rows.Count) = False Then @@ -128,8 +130,7 @@ Public Class frmReworkUsers End If Else - MsgBox("Some errors occured while checking and setting the rights...please check the log!" & vbNewLine & ">> " & ClassRights.COUNT_FILES.ToString & " files schould be worked." & _ - ">> " & ClassRights.WORKED_FILES.ToString & " were worked successfully.", MsgBoxStyle.Exclamation) + MsgBox("Some errors occured while checking and setting the rights...please check the log!" & vbNewLine & "Current Entity: " & CURR_ENTITY.ToString, MsgBoxStyle.Exclamation) End If Catch ex As Exception diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 5b10c36..8165cd1 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -86,7 +86,6 @@ - @@ -112,6 +111,7 @@ +