Compare commits
3 Commits
801f73d5c8
...
d1abc2bb1b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1abc2bb1b | ||
|
|
c347ee7d55 | ||
|
|
7f997f6802 |
@@ -16,23 +16,7 @@ Public Class ClassInit
|
|||||||
My.Application.Info.CompanyName,
|
My.Application.Info.CompanyName,
|
||||||
"OrgFlow")
|
"OrgFlow")
|
||||||
LOGGER = LOGCONFIG.GetLogger()
|
LOGGER = LOGCONFIG.GetLogger()
|
||||||
|
LOGGER.Info("OrgFlow started")
|
||||||
LOGGER.Info("## OrgFlow started - {0}", Now)
|
|
||||||
Try
|
|
||||||
Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
|
|
||||||
|
|
||||||
For Each file As IO.FileInfo In directory.GetFiles
|
|
||||||
If (Now - file.CreationTime).Days > 29 Then
|
|
||||||
file.Delete()
|
|
||||||
Else
|
|
||||||
Exit For
|
|
||||||
End If
|
|
||||||
|
|
||||||
|
|
||||||
Next
|
|
||||||
Catch ex As Exception
|
|
||||||
|
|
||||||
End Try
|
|
||||||
|
|
||||||
Dim oUserAppDataPath As String = Application.UserAppDataPath
|
Dim oUserAppDataPath As String = Application.UserAppDataPath
|
||||||
Dim oLegacyAppDataPath As String = Application.UserAppDataPath
|
Dim oLegacyAppDataPath As String = Application.UserAppDataPath
|
||||||
@@ -58,9 +42,8 @@ Public Class ClassInit
|
|||||||
|
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
Private Shared Function DecryptConnectionString(EncryptedConnectionString As String) As String
|
Private Shared Function DecryptConnectionString(EncryptedConnectionString As String) As String
|
||||||
Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
|
Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
|
||||||
@@ -131,6 +114,7 @@ Public Class ClassInit
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
@@ -173,6 +157,7 @@ Public Class ClassInit
|
|||||||
MY_ADDON_PATH = AddonPath
|
MY_ADDON_PATH = AddonPath
|
||||||
SaveMySettingsValue("PATH_ADDON", MY_ADDON_PATH, "ConfigMain")
|
SaveMySettingsValue("PATH_ADDON", MY_ADDON_PATH, "ConfigMain")
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Unexpected Error in InitAddons:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Unexpected Error in InitAddons:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
@@ -232,6 +217,7 @@ Public Class ClassInit
|
|||||||
Next
|
Next
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
@@ -244,6 +230,7 @@ Public Class ClassInit
|
|||||||
"And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
|
"And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
|
||||||
CURRENT_TBPMO_CONN_SWITCH = MYDB_ECM.GetDatatable(sql)
|
CURRENT_TBPMO_CONN_SWITCH = MYDB_ECM.GetDatatable(sql)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
LOGGER.Warn("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
|
LOGGER.Warn("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
@@ -432,6 +419,7 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
LOGGER.Warn("Unexpected Error in InitUserLogin: " & ex.Message)
|
LOGGER.Warn("Unexpected Error in InitUserLogin: " & ex.Message)
|
||||||
MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
|
||||||
Return False
|
Return False
|
||||||
|
|||||||
@@ -297,6 +297,7 @@ Module ModuleMySettings
|
|||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
|
LOGGER.Error(ex)
|
||||||
LOGGER.Warn("Error in LoadMyConfig: " & ex.Message, True)
|
LOGGER.Warn("Error in LoadMyConfig: " & ex.Message, True)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
@@ -326,7 +327,7 @@ Module ModuleMySettings
|
|||||||
table.TableName = "MyConfig"
|
table.TableName = "MyConfig"
|
||||||
|
|
||||||
' Create two columns, ID and Name.
|
' Create two columns, ID and Name.
|
||||||
Dim idColumn As DataColumn = table.Columns.Add("ID", _
|
Dim idColumn As DataColumn = table.Columns.Add("ID",
|
||||||
GetType(System.Int32))
|
GetType(System.Int32))
|
||||||
|
|
||||||
idColumn.AutoIncrement = True
|
idColumn.AutoIncrement = True
|
||||||
@@ -399,6 +400,7 @@ Module ModuleMySettings
|
|||||||
LOGGER.Info("CreateConfigTable su...")
|
LOGGER.Info("CreateConfigTable su...")
|
||||||
Return table
|
Return table
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
@@ -426,6 +428,7 @@ Module ModuleMySettings
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Error in SaveConfigValue" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Error in SaveConfigValue" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
@@ -450,6 +453,7 @@ Module ModuleMySettings
|
|||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
MsgBox("Error in Settings_LoadBasicConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
MsgBox("Error in Settings_LoadBasicConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
|
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>DD_Icons_ICO_ADDI_1.ico</ApplicationIcon>
|
<ApplicationIcon>ORGFLOW_Icon_256x256.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="CommandLine">
|
<Reference Include="CommandLine">
|
||||||
@@ -1602,6 +1602,8 @@
|
|||||||
<None Include="Resources\base_globe_32.png" />
|
<None Include="Resources\base_globe_32.png" />
|
||||||
<None Include="Resources\1480524473_1.png" />
|
<None Include="Resources\1480524473_1.png" />
|
||||||
<None Include="Resources\arrow_open_16xLG.png" />
|
<None Include="Resources\arrow_open_16xLG.png" />
|
||||||
|
<Content Include="ORGFLOW_Icon_16x16.ico" />
|
||||||
|
<Content Include="ORGFLOW_Icon_256x256.ico" />
|
||||||
<Content Include="Resources\cube.ico" />
|
<Content Include="Resources\cube.ico" />
|
||||||
<Content Include="Resources\138_PushPin_32x42_72.png" />
|
<Content Include="Resources\138_PushPin_32x42_72.png" />
|
||||||
<None Include="Resources\PropertyGridEditorPart_6041.png" />
|
<None Include="Resources\PropertyGridEditorPart_6041.png" />
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Include>
|
<Include>
|
||||||
<?define ProgramName="DD-Record-Organizer"?>
|
<?define ProgramName="DD-Record-Organizer"?>
|
||||||
<?define ProductName="Record Organizer"?>
|
<?define ProductName="OrgFlow"?>
|
||||||
<?define Manufacturer="Digital Data"?>
|
<?define Manufacturer="Digital Data"?>
|
||||||
<?define Description="Record Organizer"?>
|
<?define Description="OrgFlow"?>
|
||||||
<?define Comments="Record Organizer"?>
|
<?define Comments="OrgFlow"?>
|
||||||
<?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
|
<?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
|
||||||
|
|
||||||
<?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
|
<?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
|
||||||
|
|||||||
@@ -85,7 +85,8 @@
|
|||||||
<DirectoryRef Id="INSTALLDIR">
|
<DirectoryRef Id="INSTALLDIR">
|
||||||
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
|
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
|
||||||
<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
|
<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
|
||||||
<File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="OrgFlow.exe" KeyPath="yes" />
|
<File Id="PMOEXE" Name="OrgFlow.exe" Source="OrgFlow.exe" KeyPath="yes" />
|
||||||
|
<File Id="PMOEXECONFIG" Name="OrgFlow.exe.config" Source="OrgFlow.exe.config" KeyPath="no" />
|
||||||
<!-- Programmordner bei Deinstallation entfernen-->
|
<!-- Programmordner bei Deinstallation entfernen-->
|
||||||
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
|
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
|
||||||
</Component>
|
</Component>
|
||||||
@@ -101,8 +102,8 @@
|
|||||||
<RegistryKey Key="Classes">
|
<RegistryKey Key="Classes">
|
||||||
<RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
|
<RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
|
||||||
<RegistryValue Type="string" Name="URL Protocol" Value="" />
|
<RegistryValue Type="string" Name="URL Protocol" Value="" />
|
||||||
<RegistryValue Key="DefaultIcon" Type="string" Value=""[INSTALLDIR]DD-Record-Organizer.exe,0"" />
|
<RegistryValue Key="DefaultIcon" Type="string" Value=""[INSTALLDIR]OrgFlow.exe,0"" />
|
||||||
<RegistryValue Key="shell\open\command" Type="string" Value=""[INSTALLDIR]DD-Record-Organizer.exe" --data %1" />
|
<RegistryValue Key="shell\open\command" Type="string" Value=""[INSTALLDIR]OrgFlow.exe" --data %1" />
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
@@ -135,7 +136,15 @@
|
|||||||
<File Id="DD_Rights" Name="DD_Rights.dll" KeyPath="no" />
|
<File Id="DD_Rights" Name="DD_Rights.dll" KeyPath="no" />
|
||||||
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" KeyPath="no" />
|
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" KeyPath="no" />
|
||||||
<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
|
<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDWindream" Name="DigitalData.Modules.Windream.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDBase" Name="DigitalData.Modules.Base.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/>
|
||||||
|
<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
|
|
||||||
<!-- DD Bibliotheken -->
|
<!-- DD Bibliotheken -->
|
||||||
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
|
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
|
||||||
<File Id="OfficeLib" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
|
<File Id="OfficeLib" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
|
||||||
@@ -256,7 +265,7 @@
|
|||||||
<Component Id="ApplicationShortcut_StartMenu" Guid="508a08d6-73fc-43d4-8861-b432ba92e44e">
|
<Component Id="ApplicationShortcut_StartMenu" Guid="508a08d6-73fc-43d4-8861-b432ba92e44e">
|
||||||
<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
|
<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
|
||||||
Name="$(var.ProductName)"
|
Name="$(var.ProductName)"
|
||||||
Target="[INSTALLDIR]$(var.ProgramName).exe"
|
Target="[INSTALLDIR]OrgFlow.exe"
|
||||||
WorkingDirectory="INSTALLDIR"/>
|
WorkingDirectory="INSTALLDIR"/>
|
||||||
<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
|
<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
|
||||||
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
||||||
@@ -267,7 +276,7 @@
|
|||||||
<Component Id="ApplicationShortcut_Desktop" Guid="89ff1c33-08f7-4270-a858-2d6c7cbf9ba1">
|
<Component Id="ApplicationShortcut_Desktop" Guid="89ff1c33-08f7-4270-a858-2d6c7cbf9ba1">
|
||||||
<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
|
<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
|
||||||
Name="$(var.ProductName)"
|
Name="$(var.ProductName)"
|
||||||
Target="[INSTALLDIR]$(var.ProgramName).exe"
|
Target="[INSTALLDIR]OrgFlow.exe"
|
||||||
WorkingDirectory="INSTALLDIR"/>
|
WorkingDirectory="INSTALLDIR"/>
|
||||||
<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
|
<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
|
||||||
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user