edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen Rechnugen, Chat, cAllgemeint

Browse Source
This commit is contained in:
d.breimaier
2024-09-30 14:11:36 +02:00
parent d0c24e7ac0
commit a5921c5faf
9 changed files with 106 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
View File

@@ -14,8 +14,8 @@ Public Class frmMessenger
Dim topMessages As String = "20"
Dim topMessagesDateHistory As Object = Nothing
Dim loaded = False
Public EMOJI_PATH_MAIN = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
Public EMOJI_PATH = cAllgemein.EMOJI_PATH
'Public EMOJI_PATH_MAIN = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
Public EMOJI_PATH_LOCAL = cAllgemein.EMOJI_PATH
Public AvisoId As Integer = -1
Public SendungID As Integer = -1
@@ -39,34 +39,34 @@ Public Class frmMessenger
Sub initEMOJI_PATH()
EMOJI_PATH = EMOJI_PATH_MAIN
Try
Dim IPADDR As System.Net.IPAddress
IPADDR = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0)
'EMOJI_PATH_LOCAL = EMOJI_PATH_MAIN
'Try
' Dim IPADDR As System.Net.IPAddress
' IPADDR = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0)
If IPADDR.ToString.Contains("172.16.1.") Then 'WAIDHAUS
EMOJI_PATH = "\\172.16.1.100\f\PROGRAMME\CHAT_EMOJIS\"
End If
' If IPADDR.ToString.Contains("172.16.1.") Then 'WAIDHAUS
' EMOJI_PATH = "\\172.16.1.100\f\PROGRAMME\CHAT_EMOJIS\"
' End If
If IPADDR.ToString.Contains("192.168.133.") Then 'SALZBURG
EMOJI_PATH = "\\192.168.133.98\f\Programme\CHAT_EMOJIS\"
End If
' If IPADDR.ToString.Contains("192.168.133.") Then 'SALZBURG
' EMOJI_PATH = "\\192.168.133.98\f\Programme\CHAT_EMOJIS\"
' End If
If IPADDR.ToString.Contains("192.168.32.") Then 'NICKELSDORF
EMOJI_PATH = "\\192.168.32.253\Files\Programme\CHAT_EMOJIS\"
End If
' If IPADDR.ToString.Contains("192.168.32.") Then 'NICKELSDORF
' EMOJI_PATH = "\\192.168.32.253\Files\Programme\CHAT_EMOJIS\"
' End If
If IPADDR.ToString.Contains("192.168.100") Then 'NEUHAUS
EMOJI_PATH = "\\192.168.100.20\Share\Programme\CHAT_EMOJIS\"
End If
' If IPADDR.ToString.Contains("192.168.100") Then 'NEUHAUS
' EMOJI_PATH = "\\192.168.100.20\Share\Programme\CHAT_EMOJIS\"
' End If
If Not System.IO.Directory.Exists(EMOJI_PATH) Then
EMOJI_PATH = EMOJI_PATH_MAIN
End If
' If Not System.IO.Directory.Exists(EMOJI_PATH) Then
' EMOJI_PATH = EMOJI_PATH_MAIN
' End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
'Catch ex As Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
'End Try
End Sub
Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellContentClick, dgvChats.CellClick
@@ -138,8 +138,8 @@ Public Class frmMessenger
Dim spezialEmoji = False
If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then spezialEmoji = True
If System.IO.Directory.Exists(EMOJI_PATH) Then
For Each aa In System.IO.Directory.GetFiles(EMOJI_PATH) '.OrderBy(Function(f) f)
If System.IO.Directory.Exists(EMOJI_PATH_LOCAL) Then
For Each aa In System.IO.Directory.GetFiles(EMOJI_PATH_LOCAL) '.OrderBy(Function(f) f)
If (alloweasteregg Or Not aa.Contains("easteregg")) Then
If System.IO.File.Exists(aa) And aa.Contains(".png") And (aa.Contains("emoji_") Or spezialEmoji) Then
If hiddemEmojis Or Not aa.Contains("_hidden") Then