Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb

@@ -56,11 +56,11 @@ Public Class cMessenger
 
     Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer
         If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "  AND chatMgSt_gelesen=0  AND chat_art='" & chat_art & "'", "ADMIN",,, 0)
+        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "  AND chatMgSt_gelesen=0  AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0)
     End Function
     Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer
         If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "   AND chatMgSt_gelesen=0 AND chat_aktiv=0  AND chat_art='" & chat_art & "'", "ADMIN",,, 0)
+        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "   AND chatMgSt_gelesen=0 AND chat_aktiv=0  AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0)
     End Function
 
     Public Shared Function GET_NewMSG_COUNT_AVISOID(AvisoId As Integer) As Integer

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -1428,11 +1428,16 @@ Public Class cFormularManager
 
                     If doc IsNot Nothing Then
                         doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
-                        doc.SaveToFile(targetPath)
+                        If targetPath.EndsWith(".pdf") Then
+                            doc.SaveToFile(targetPath)
+                        Else
+                            doc.SaveToFile(targetPath & "\" & filename)
+                        End If
+
                         If openFileAfterDownload Then
 
+                            End If
                         End If
-                    End If
                 End Using
             End Using