Merge branch 'master' of http://172.24.11.74:90/scm/git/DDMonorepo
This commit is contained in:
commit
32b000c947
@ -164,7 +164,7 @@ Public Class frmEmailAccount
|
||||
|
||||
Dim PWPlain = wrapper.DecryptData(txtEMAIL_PW.Text)
|
||||
|
||||
If _Email.NewEmail(txtTestmail.Text, "Testmail DD Windream-ResultHandler", "This is the body (text will be replaced within profile)", txtEMAIL_FROM.Text, txtSERVER_OUT.Text, txtPORT_OUT.Text, txtEMAIL_USER.Text, PWPlain, cmbAUTH_TYPE.Text, "EDMI GUI") = True Then
|
||||
If _Email.NewEmail(txtTestmail.Text, "Testmail", "This is the bodytext", txtEMAIL_FROM.Text, txtSERVER_OUT.Text, txtPORT_OUT.Text, txtEMAIL_USER.Text, PWPlain, cmbAUTH_TYPE.Text, "EDMI GUI") = True Then
|
||||
MsgBox("Email was send successfully.", MsgBoxStyle.Information)
|
||||
Else
|
||||
MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
|
||||
|
||||
@ -1234,23 +1234,6 @@ Public Class Windream2
|
||||
End Try
|
||||
Dim ExportFileIO = New WMOTOOLLib.WMFileIO ' CreateObject("WMOTOOLLib.WMFileIO") ' New WMOTOOLLib.WMFileIO
|
||||
_logger.Debug("ExportFileIO created...")
|
||||
' Stream Interface bereitstellen
|
||||
'Try
|
||||
' oWMObject.LockFor(WMObjectEditModeMoveReadOnly) 'WMObjectEditModeFileSystem)
|
||||
'Catch ex As Exception
|
||||
' If Not oWMObject.aLocked Then
|
||||
' Try
|
||||
' oWMObject.lock()
|
||||
' Catch ex1 As Exception
|
||||
' _logger.Warn($"{ex1.Message} Could not lock document - DocID: {DocId}")
|
||||
' Return False
|
||||
' End Try
|
||||
|
||||
' End If
|
||||
' '_logger.(ex)
|
||||
|
||||
'End Try
|
||||
|
||||
Dim oWMStream = oWMObject.OpenStream("BinaryObject", 1)
|
||||
'### VERSIONIERUNG ###
|
||||
Dim version As Integer = 2
|
||||
@ -1267,10 +1250,9 @@ Public Class Windream2
|
||||
ExportFileIO.bstrOriginalFileName = tempFilename
|
||||
'Das eigentliche kopieren
|
||||
ExportFileIO.ExportOriginal(True)
|
||||
' close the windream file stream
|
||||
'close the windream file stream
|
||||
oWMStream.Close()
|
||||
_logger.Info($"WMFile DocID {DocId} has been exported to {tempFilename} ")
|
||||
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
_logger.Error(ex)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user