From b8f7c7bf6e9758eb8d8788c401fefb5da5edb264 Mon Sep 17 00:00:00 2001
From: Marcus <mxxxxb@me.com>
Date: Tue, 29 Jul 2025 11:57:02 +0200
Subject: [PATCH] =?UTF-8?q?Umstellung=20auf=20SSL=20Neue=20Icons=20f=C3=BC?=
 =?UTF-8?q?r=20Konnektivit=C3=A4t=20Warnings=20beseitigt=20PreUpgrade=20vo?=
 =?UTF-8?q?n=20BouncyCastle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZKuP/AddCardUser.xaml.cs           |   2 +-
 ZKuP/AddFirmenList.xaml.cs         |   6 +-
 ZKuP/App.xaml                      |   2 +
 ZKuP/Arrivals.xaml.cs              |   6 +-
 ZKuP/Belegung.xaml.cs              |   2 +-
 ZKuP/CreateFirma.xaml.cs           |  72 +++++------
 ZKuP/CreateVisitor_List.xaml.cs    |  18 +--
 ZKuP/Delivery.xaml.cs              |   2 +-
 ZKuP/Family.xaml.cs                |   2 +-
 ZKuP/GrantParkausweis.xaml.cs      |  80 ++++++------
 ZKuP/Helper.cs                     |   5 +-
 ZKuP/KartenTausch.xaml.cs          |   1 -
 ZKuP/MainWindow.xaml               | 192 ++++++++++++++++++++++++++++-
 ZKuP/MainWindow.xaml.cs            |  56 ++++++---
 ZKuP/ManageAsp.xaml.cs             |  66 +++++-----
 ZKuP/ManageDeliveries.xaml.cs      |  66 +++++-----
 ZKuP/ManageEntstoerdienste.xaml.cs |  68 +++++-----
 ZKuP/ManageUsers.xaml.cs           |  58 ++++-----
 ZKuP/ManageVisitor.xaml.cs         |  84 ++++++-------
 ZKuP/Resources/ConnectedSecure.png | Bin 0 -> 5818 bytes
 ZKuP/Resources/Lock.png            | Bin 0 -> 1636 bytes
 ZKuP/SQL.cs                        |  58 +++++----
 ZKuP/Signature.xaml.cs             |  16 +--
 ZKuP/ZKuP.csproj                   |   7 ++
 24 files changed, 547 insertions(+), 322 deletions(-)
 create mode 100644 ZKuP/Resources/ConnectedSecure.png
 create mode 100644 ZKuP/Resources/Lock.png

diff --git a/ZKuP/AddCardUser.xaml.cs b/ZKuP/AddCardUser.xaml.cs
index 56ad7dd..20b8819 100644
--- a/ZKuP/AddCardUser.xaml.cs
+++ b/ZKuP/AddCardUser.xaml.cs
@@ -22,7 +22,7 @@ namespace ZKuP
     public partial class AddCardUser : MetroWindow
     {
         string _user = "";
-        string _ansprechpartnerFirma = "";
+        //string _ansprechpartnerFirma = "";
         bool _isBesucher = false;
         List<string> comboList = new List<string>() { "Grün", "Rot", "Gerätewagen" };
         List<string> comboListNurRot = new List<string>() { "Rot" };
diff --git a/ZKuP/AddFirmenList.xaml.cs b/ZKuP/AddFirmenList.xaml.cs
index 80a9646..738c8f6 100644
--- a/ZKuP/AddFirmenList.xaml.cs
+++ b/ZKuP/AddFirmenList.xaml.cs
@@ -53,7 +53,7 @@ namespace ZKuP
                     {
                         if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
                         {
-                            if (boxes[i].Tag == "Name")
+                            if (boxes[i].Tag.ToString() == "Name")
                                 boxes[i].Text = list[i];
                         }
                     }
@@ -66,7 +66,7 @@ namespace ZKuP
                     {
                         if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
                         {
-                            if (boxes[i].Tag == "Tel")
+                            if (boxes[i].Tag.ToString() == "Tel")
                                 boxes[i].Text = list[i];
                         }
                     }
@@ -84,7 +84,7 @@ namespace ZKuP
 
         private void BuildWindow(int besucherAnzahl)
         {
-            int maxProSpalte = 10;    // Maximale Anzahl an Textfeldern pro Spalte
+            //int maxProSpalte = 10;    // Maximale Anzahl an Textfeldern pro Spalte
 
             // PanelsContainer soll die WrapPanels halten
             spGroupPers.Children.Clear();  // Vorherige Panels entfernen (falls schon welche existieren)
diff --git a/ZKuP/App.xaml b/ZKuP/App.xaml
index f646394..d8ff4e3 100644
--- a/ZKuP/App.xaml
+++ b/ZKuP/App.xaml
@@ -20,6 +20,8 @@
             <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Styles.Button.Flat}">
                 <Setter Property="mah:ControlsHelper.CornerRadius" Value="4"/>
             </Style>
+
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/ZKuP/Arrivals.xaml.cs b/ZKuP/Arrivals.xaml.cs
index ce89f15..8e52671 100644
--- a/ZKuP/Arrivals.xaml.cs
+++ b/ZKuP/Arrivals.xaml.cs
@@ -32,7 +32,7 @@ namespace ZKuP
         int firmenCount = 0;
         int besucherCount = 0;
         bool arrivalClicked = false;
-        bool kl_EinweisungClicked = false;
+        //bool kl_EinweisungClicked = false;
         //string query = "";
         MySqlCommand query = new MySqlCommand();
         byte[] _signature = null;
@@ -1073,8 +1073,8 @@ namespace ZKuP
 
         private async void btnSignature_Click(object sender, RoutedEventArgs e)
         {
-            string kat = "1";
-            string firmaBesucher = "";
+            //string kat = "1";
+            //string firmaBesucher = "";
             string name = "";
 
             var kennzeichenTextboxes = spKennzeichen.Children.OfType<TextBox>().ToList();
diff --git a/ZKuP/Belegung.xaml.cs b/ZKuP/Belegung.xaml.cs
index 3b8d50d..4e8f005 100644
--- a/ZKuP/Belegung.xaml.cs
+++ b/ZKuP/Belegung.xaml.cs
@@ -616,7 +616,7 @@ namespace ZKuP
 
         private void btnCurrentlyBooked_Click(object sender, RoutedEventArgs e)
         {
-            if (btnCurrentlyBooked.Content == "Alle gebuchten Flächen anzeigen")
+            if (btnCurrentlyBooked.Content.ToString() == "Alle gebuchten Flächen anzeigen")
             {
                 be = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.beBelegung WHERE bis >= curdate() ORDER BY beNr ASC, bis ASC").Result;
                 dgBelegung.DataContext = be;
diff --git a/ZKuP/CreateFirma.xaml.cs b/ZKuP/CreateFirma.xaml.cs
index f966e08..6d9c7a9 100644
--- a/ZKuP/CreateFirma.xaml.cs
+++ b/ZKuP/CreateFirma.xaml.cs
@@ -2197,46 +2197,46 @@ namespace ZKuP
         }
     }
 
-    public class Firma
-    {
-        public string Name;
-        string Verantwortlicher_MA_Firma;
-        string Tel_Nr_Verantwortlicher_Firma;
-        string Anzahl_Begleiter;
-        string Anzahl_Fzg;
-        string Beauftragte_Leistung;
-        string Arbeitsbeginn;
-        string Arbeitsende;
-        string Örtliche_Einweisung_bis;
-        string Ansprechpartner_Intern;
-        string Tel_Nr_Ansprechpartner_Intern;
+    //public class Firma
+    //{
+    //    public string Name;
+    //    string Verantwortlicher_MA_Firma;
+    //    string Tel_Nr_Verantwortlicher_Firma;
+    //    string Anzahl_Begleiter;
+    //    string Anzahl_Fzg;
+    //    string Beauftragte_Leistung;
+    //    string Arbeitsbeginn;
+    //    string Arbeitsende;
+    //    string Örtliche_Einweisung_bis;
+    //    string Ansprechpartner_Intern;
+    //    string Tel_Nr_Ansprechpartner_Intern;
 
 
 
 
-        public static List<Firma> DataTableToFirma(System.Data.DataTable dataTable)
-        {
-            List<Firma> x = new List<Firma>();
+    //    public static List<Firma> DataTableToFirma(System.Data.DataTable dataTable)
+    //    {
+    //        List<Firma> x = new List<Firma>();
 
-            foreach (DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Firma()
-                {
-                    Name = dr[1].ToString(),
-                    Verantwortlicher_MA_Firma = dr[2].ToString(),
-                    Tel_Nr_Verantwortlicher_Firma = dr[3].ToString(),
-                    Anzahl_Begleiter = dr[4].ToString(),
-                    Anzahl_Fzg = dr[5].ToString(),
-                    Beauftragte_Leistung = dr[6].ToString(),
-                    Arbeitsbeginn = dr[7].ToString(),
-                    Arbeitsende = dr[8].ToString(),
-                    Örtliche_Einweisung_bis = dr[9].ToString(),
-                    Ansprechpartner_Intern = dr[10].ToString(),
-                    Tel_Nr_Ansprechpartner_Intern = dr[11].ToString()
-                });
-            }
+    //        foreach (DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Firma()
+    //            {
+    //                Name = dr[1].ToString(),
+    //                Verantwortlicher_MA_Firma = dr[2].ToString(),
+    //                Tel_Nr_Verantwortlicher_Firma = dr[3].ToString(),
+    //                Anzahl_Begleiter = dr[4].ToString(),
+    //                Anzahl_Fzg = dr[5].ToString(),
+    //                Beauftragte_Leistung = dr[6].ToString(),
+    //                Arbeitsbeginn = dr[7].ToString(),
+    //                Arbeitsende = dr[8].ToString(),
+    //                Örtliche_Einweisung_bis = dr[9].ToString(),
+    //                Ansprechpartner_Intern = dr[10].ToString(),
+    //                Tel_Nr_Ansprechpartner_Intern = dr[11].ToString()
+    //            });
+    //        }
 
-            return x;
-        }
-    }
+    //        return x;
+    //    }
+    //}
 }
diff --git a/ZKuP/CreateVisitor_List.xaml.cs b/ZKuP/CreateVisitor_List.xaml.cs
index 76a0bc1..06d47f7 100644
--- a/ZKuP/CreateVisitor_List.xaml.cs
+++ b/ZKuP/CreateVisitor_List.xaml.cs
@@ -23,12 +23,12 @@ namespace ZKuP
     /// </summary>
     public partial class CreateVisitor_List : MetroWindow
 	{
-        private List<Visitor> myVar;
-        public List<Visitor> VisitorView
-        {
-            get { return myVar; }
-            set { myVar = value; }
-        }
+        //private List<Visitor> myVar;
+        //public List<Visitor> VisitorView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; }
+        //}
 
         DataTable visitors = new DataTable("Visitors");
 
@@ -44,7 +44,7 @@ namespace ZKuP
             this.Title = "Besucherliste von: " + Helper.InsertSpaceBeforeUpperCase(Environment.UserName);
 
             visitors = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
-            VisitorView = Visitor.DataTableToVisitor(visitors);
+            //VisitorView = Visitor.DataTableToVisitor(visitors);
             dgVisitors.DataContext = visitors;
 
             dgVisitors.Items.SortDescriptions.Clear();
@@ -115,7 +115,7 @@ namespace ZKuP
             dgVisitors.PreviewKeyDown += DgVisitors_PreviewKeyDown;
 
             visitors = SQL.ReadSQL($"Select * from {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
-            VisitorView = Visitor.DataTableToVisitor(visitors);
+            //VisitorView = Visitor.DataTableToVisitor(visitors);
 
 
             dgVisitors.RowValidationErrorTemplate = new ControlTemplate();
@@ -192,7 +192,7 @@ namespace ZKuP
             await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.besucher WHERE `idbesucher` = '{arr[0]}'");
 
             visitors = SQL.ReadSQL($"Select * from {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
-            VisitorView = Visitor.DataTableToVisitor(visitors);
+            //VisitorView = Visitor.DataTableToVisitor(visitors);
         }
 
 
diff --git a/ZKuP/Delivery.xaml.cs b/ZKuP/Delivery.xaml.cs
index c550a7a..38d5067 100644
--- a/ZKuP/Delivery.xaml.cs
+++ b/ZKuP/Delivery.xaml.cs
@@ -51,7 +51,7 @@ namespace ZKuP
         };
 
 
-        string query = "";
+        //string query = "";
 
         byte[] _signature = null;
         bool _emergency = false;
diff --git a/ZKuP/Family.xaml.cs b/ZKuP/Family.xaml.cs
index c852ed5..d90d12a 100644
--- a/ZKuP/Family.xaml.cs
+++ b/ZKuP/Family.xaml.cs
@@ -23,7 +23,7 @@ namespace ZKuP
     public partial class Family : MetroWindow
     {
         DataTable dtOwn;
-        DataTable dtAll;
+        //DataTable dtAll;
 
         public Family()
         {
diff --git a/ZKuP/GrantParkausweis.xaml.cs b/ZKuP/GrantParkausweis.xaml.cs
index 93cd724..ac3bc87 100644
--- a/ZKuP/GrantParkausweis.xaml.cs
+++ b/ZKuP/GrantParkausweis.xaml.cs
@@ -104,48 +104,48 @@ namespace ZKuP
         }
     }
 
-    public class Grant
-    {
-        int idparkausweise;
-        string MA_Vorname;
-        string MA_Name;
-        string Kennzeichen;
-        string Email;
-        string Telefon;
-        string Abteilung;
-        string Firma;
-        string Adresse;
-        string PLZ;
-        string Vorgesetzter;
-        int Schicht;
-        int isKrad;
+    //public class Grant
+    //{
+    //    int idparkausweise;
+    //    string MA_Vorname;
+    //    string MA_Name;
+    //    string Kennzeichen;
+    //    string Email;
+    //    string Telefon;
+    //    string Abteilung;
+    //    string Firma;
+    //    string Adresse;
+    //    string PLZ;
+    //    string Vorgesetzter;
+    //    int Schicht;
+    //    int isKrad;
 
 
-        public static List<Grant> DataTableToGrant(System.Data.DataTable dataTable)
-        {
-            List<Grant> x = new List<Grant>();
+    //    public static List<Grant> DataTableToGrant(System.Data.DataTable dataTable)
+    //    {
+    //        List<Grant> x = new List<Grant>();
 
-            foreach (System.Data.DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Grant()
-                {
-                    idparkausweise = (int)dr[0],
-                    MA_Vorname = dr[1].ToString(),
-                    MA_Name = dr[2].ToString(),
-                    Kennzeichen = dr[3].ToString(),
-                    Email = dr[4].ToString(),
-                    Telefon = dr[5].ToString(),
-                    Abteilung = dr[6].ToString(),
-                    Firma = dr[7].ToString(),
-                    Adresse = dr[8].ToString(),
-                    PLZ = dr[9].ToString(),
-                    Vorgesetzter = dr[10].ToString(),
-                    Schicht = (int)dr[11],
-                    isKrad = (int)dr[12]
-                });
-            }
+    //        foreach (System.Data.DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Grant()
+    //            {
+    //                idparkausweise = (int)dr[0],
+    //                MA_Vorname = dr[1].ToString(),
+    //                MA_Name = dr[2].ToString(),
+    //                Kennzeichen = dr[3].ToString(),
+    //                Email = dr[4].ToString(),
+    //                Telefon = dr[5].ToString(),
+    //                Abteilung = dr[6].ToString(),
+    //                Firma = dr[7].ToString(),
+    //                Adresse = dr[8].ToString(),
+    //                PLZ = dr[9].ToString(),
+    //                Vorgesetzter = dr[10].ToString(),
+    //                Schicht = (int)dr[11],
+    //                isKrad = (int)dr[12]
+    //            });
+    //        }
 
-            return x;
-        }
-    }
+    //        return x;
+    //    }
+    //}
 }
diff --git a/ZKuP/Helper.cs b/ZKuP/Helper.cs
index 304fe49..aed1517 100644
--- a/ZKuP/Helper.cs
+++ b/ZKuP/Helper.cs
@@ -285,10 +285,10 @@ namespace ZKuP
             {
                 case 1:
                     return (from System.Data.DataRow dr in dataTable.Rows select dr[startColumn + 0].ToString()).ToList();
-                    break;
+                    //break;
                 case 2:
                     return (from System.Data.DataRow dr in dataTable.Rows select dr[startColumn + 0].ToString() + " " + dr[startColumn + 1].ToString()).ToList();
-                    break;
+                    //break;
 
 
                 default:
@@ -992,7 +992,6 @@ namespace ZKuP
                 {
                     case MessageBoxResult.Yes:
                         return;
-                        break;
                     case MessageBoxResult.No:
                         App.BringOtherInstanceToFront();
                         Application.Current.Shutdown();
diff --git a/ZKuP/KartenTausch.xaml.cs b/ZKuP/KartenTausch.xaml.cs
index c0ca5c7..25c5c0e 100644
--- a/ZKuP/KartenTausch.xaml.cs
+++ b/ZKuP/KartenTausch.xaml.cs
@@ -44,7 +44,6 @@ namespace ZKuP
 
         private void Helper_DataReceived(object sender, string e)
         {
-            var text = "";
             Dispatcher.Invoke(() =>
             {
                 if (cbRot.ItemsSource.Cast<string>().ToList().Contains(e.Split('=')[0].ToString()))
diff --git a/ZKuP/MainWindow.xaml b/ZKuP/MainWindow.xaml
index f76b67f..ef8c86f 100644
--- a/ZKuP/MainWindow.xaml
+++ b/ZKuP/MainWindow.xaml
@@ -48,6 +48,186 @@
                 <EasingDoubleKeyFrame KeyTime="00:00:01" Value="1"/>
             </DoubleAnimationUsingKeyFrames>
         </Storyboard>
+
+
+        <!-- Connected Icon -->
+        <DrawingImage x:Key="ConnectedIcon">
+            <DrawingImage.Drawing>
+                <DrawingGroup ClipGeometry="M0,0 V100 H300 V0 H0 Z">
+                    <DrawingGroup.Transform>
+                        <TranslateTransform X="25" Y="8" />
+                    </DrawingGroup.Transform>
+                    <DrawingGroup Opacity="1" Transform="1,0,0,1,50,50">
+                        <GeometryDrawing Brush="#FF22C55E">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FF16A34A" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="8" RadiusY="8" Rect="-25,-8,20,16" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FF22C55E">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FF16A34A" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="8" RadiusY="8" Rect="5,-8,20,16" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FFFFFFFF">
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="1" RadiusY="1" Rect="-8,-3,6,6" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FFFFFFFF">
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="1" RadiusY="1" Rect="2,-3,6,6" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FF000000">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FF16A34A" Thickness="3" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                            <GeometryDrawing.Geometry>
+                                <LineGeometry StartPoint="-5,0" EndPoint="5,0" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                    </DrawingGroup>
+                </DrawingGroup>
+            </DrawingImage.Drawing>
+        </DrawingImage>
+        <!--<DrawingImage x:Key="ConnectedIcon">
+            <DrawingImage.Drawing>
+                <DrawingGroup>
+                    --><!-- Left connector part --><!--
+                    <GeometryDrawing Brush="#22c55e" 
+                    Geometry="M0,8 L20,8 A8,8 0 0,1 20,24 L0,24 A8,8 0 0,1 0,8 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#16a34a" Thickness="2"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+
+                    --><!-- Right connector part --><!--
+                    <GeometryDrawing Brush="#22c55e" 
+                    Geometry="M30,8 L50,8 A8,8 0 0,1 50,24 L30,24 A8,8 0 0,1 30,8 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#16a34a" Thickness="2"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+
+                    --><!-- Left pin --><!--
+                    <GeometryDrawing Brush="White" 
+                    Geometry="M17,13 L23,13 A1,1 0 0,1 23,19 L17,19 A1,1 0 0,1 17,13 Z"/>
+
+                    --><!-- Right pin --><!--
+                    <GeometryDrawing Brush="White" 
+                    Geometry="M27,13 L33,13 A1,1 0 0,1 33,19 L27,19 A1,1 0 0,1 27,13 Z"/>
+
+                    --><!-- Connection line --><!--
+                    <GeometryDrawing>
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#16a34a" Thickness="3"/>
+                        </GeometryDrawing.Pen>
+                        <GeometryDrawing.Geometry>
+                            <LineGeometry StartPoint="20,16" EndPoint="30,16"/>
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingGroup>
+            </DrawingImage.Drawing>
+        </DrawingImage>-->
+
+        <!-- Not Connected Icon -->
+        <DrawingImage x:Key="NotConnectedIcon">
+            <DrawingImage.Drawing>
+                <DrawingGroup ClipGeometry="M0,0 V100 H300 V0 H0 Z">
+                    <DrawingGroup.Transform>
+                        <TranslateTransform X="30" Y="8" />
+                    </DrawingGroup.Transform>
+                    <DrawingGroup Opacity="1" Transform="1,0,0,1,150,50">
+                        <GeometryDrawing Brush="#FFEF4444">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FFDC2626" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="8" RadiusY="8" Rect="-30,-8,20,16" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FFEF4444">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FFDC2626" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="8" RadiusY="8" Rect="15,-8,20,16" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FFFFFFFF">
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="1" RadiusY="1" Rect="-13,-3,6,6" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Brush="#FFFFFFFF">
+                            <GeometryDrawing.Geometry>
+                                <RectangleGeometry RadiusX="1" RadiusY="1" Rect="18,-3,6,6" />
+                            </GeometryDrawing.Geometry>
+                        </GeometryDrawing>
+                        <GeometryDrawing Geometry="F1 M300,100z M0,0z M-5,-2L0,0 -5,2 M5,-2L10,0 5,2">
+                            <GeometryDrawing.Pen>
+                                <Pen Brush="#FFEF4444" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            </GeometryDrawing.Pen>
+                        </GeometryDrawing>
+                    </DrawingGroup>
+                </DrawingGroup>
+            </DrawingImage.Drawing>
+        </DrawingImage>
+        <!--<DrawingImage x:Key="NotConnectedIcon">
+            <DrawingImage.Drawing>
+                <DrawingGroup>
+                    --><!-- Left connector part --><!--
+                    <GeometryDrawing Brush="#ef4444" 
+                    Geometry="M0,8 L20,8 A8,8 0 0,1 20,24 L0,24 A8,8 0 0,1 0,8 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#dc2626" Thickness="2"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+
+                    --><!-- Right connector part (separated) --><!--
+                    <GeometryDrawing Brush="#ef4444" 
+                    Geometry="M35,8 L55,8 A8,8 0 0,1 55,24 L35,24 A8,8 0 0,1 35,8 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#dc2626" Thickness="2"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+
+                    --><!-- Left pin --><!--
+                    <GeometryDrawing Brush="White" 
+                    Geometry="M17,13 L23,13 A1,1 0 0,1 23,19 L17,19 A1,1 0 0,1 17,13 Z"/>
+
+                    --><!-- Right pin --><!--
+                    <GeometryDrawing Brush="White" 
+                    Geometry="M38,13 L44,13 A1,1 0 0,1 44,19 L38,19 A1,1 0 0,1 38,13 Z"/>
+
+                    --><!-- Spark/gap indication --><!--
+                    <GeometryDrawing>
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#ef4444" Thickness="2"/>
+                        </GeometryDrawing.Pen>
+                        <GeometryDrawing.Geometry>
+                            <PathGeometry>
+                                <PathFigure StartPoint="25,14">
+                                    <LineSegment Point="30,16"/>
+                                    <LineSegment Point="25,18"/>
+                                </PathFigure>
+                                <PathFigure StartPoint="30,14">
+                                    <LineSegment Point="35,16"/>
+                                    <LineSegment Point="30,18"/>
+                                </PathFigure>
+                            </PathGeometry>
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingGroup>
+            </DrawingImage.Drawing>
+        </DrawingImage>-->
+        
     </mah:MetroWindow.Resources>
 
 
@@ -1071,9 +1251,15 @@
         </Grid>
         
         <Grid Margin="0,-25,200,0" HorizontalAlignment="Right" VerticalAlignment="Top">
-            
-            <Image Source="/Resources/ConnBackground.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
-            <Image x:Name="imgConnection" Source="/Resources/Disconnected.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
+
+            <Border>
+                <Grid Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">
+                    <Image Source="/Resources/ConnBackground.png" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
+                    <!--<Image x:Name="imgConnection" Source="/Resources/Disconnected.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>-->
+                    <Image x:Name="imgConnection" Source="{StaticResource NotConnectedIcon}" Width="38" Height="30" Margin="2,0,2,4" HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Uniform"/>
+                    <Image x:Name="imgSecureConn" Source="/Resources/Lock.png" ToolTip="Verbindung OK und gesichert" Visibility="Collapsed" Width="16" Margin="26,2,0,0"/>
+                </Grid>
+            </Border>
 
             <Button x:Name="btnDarkMode"  Click="btnDarkMode_Click" Padding="2,3,2,0" FontWeight="Regular" Visibility="Visible" Panel.ZIndex="100" Margin="50,0,0,0" HorizontalAlignment="Left" Width="35" Height="25" VerticalAlignment="Top">
                 <Image x:Name="imgDarkModeButton" Source="/Resources/Moon.png"/>
diff --git a/ZKuP/MainWindow.xaml.cs b/ZKuP/MainWindow.xaml.cs
index 89c2e0f..278c270 100644
--- a/ZKuP/MainWindow.xaml.cs
+++ b/ZKuP/MainWindow.xaml.cs
@@ -43,7 +43,7 @@ namespace ZKuP
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public const string Version = "5.1.0.0";
+        public const string Version = "5.1.0.1";
         public static Roles LoggedInRole { get; private set; } = Roles.None;
 
 
@@ -91,10 +91,11 @@ namespace ZKuP
         DispatcherTimer ausfahrtTimer = new DispatcherTimer();
 
         RoutedCommand resetWindow;
-        RoutedCommand skullWindow;
+        //RoutedCommand skullWindow;
 
         int maxBikes = 24;
         bool ReadyToSavePosition = false;
+        bool isSecureConn = false;
 
         public MainWindow()
         {
@@ -280,7 +281,7 @@ namespace ZKuP
             await Task.Run(() => AuthenticateUser());
 
 
-            SQL.GetCipher();
+            isSecureConn = SQL.IsSecureConnection();
 //#if !DEBUG
             Helper.CheckIfMultipleInstances();
 //#endif
@@ -528,8 +529,9 @@ namespace ZKuP
                         this.Top = Settings.GetSettingDouble("Top");
 
                         var ws = Settings.GetSetting("WindowState");
+#pragma warning disable CS0252
                         this.WindowState = ws == "" ? WindowState.Normal : (WindowState)ws;
-
+#pragma warning restore CS0252
                         //double ratio = Settings.GetSettingDouble("ColumnRatio");
 
                         // Gespeicherte Werte laden
@@ -1394,6 +1396,7 @@ namespace ZKuP
         }
 
         bool lastConn = false;
+        bool lastConnSecure = false;
         bool connMsg = true;
         private async Task CheckConnection(bool first = false)
         {
@@ -1406,18 +1409,33 @@ namespace ZKuP
 
             if (conn.IsConnected)
             {
-                if (conn.IsConnected != lastConn)
+                if (conn.IsConnected != lastConn || isSecureConn != lastConnSecure)
                 {
-                    imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
-                                + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
-                                + ";component/"
-                                + $"Resources/Connected.png", UriKind.Absolute));
+                    //imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
+                    //            + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
+                    //            + ";component/"
+                    //            + $"Resources/ConnectedSecure.png", UriKind.Absolute));
+                    imgConnection.Source = (ImageSource)this.FindResource("ConnectedIcon");
 
                     imgConnection.ToolTip = $"Verbindung OK";
 
                     (this.Resources["sbConnection"] as System.Windows.Media.Animation.Storyboard).Begin();
                     (this.Resources["sbConnection"] as System.Windows.Media.Animation.Storyboard).Stop();
                     lastConn = conn.IsConnected;
+
+
+                    if (isSecureConn)
+                    {
+                        lastConnSecure = isSecureConn;
+                        imgConnection.ToolTip += $" und gesichert";
+                        imgSecureConn.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        lastConnSecure = isSecureConn;
+                        imgConnection.ToolTip = $"Verbindung OK";
+                        imgSecureConn.Visibility = Visibility.Collapsed;
+                    }
                 }
             }
             else
@@ -1432,21 +1450,22 @@ namespace ZKuP
 
                         MessageBox.Show("Sie haben keine Verbindung zur Datenbank und das DB VPN 'Ivanti Secure Access (ehem. Pulse Secure)' ist nicht verbunden\n\n" +
                                         "Befinden Sie sich außerhalb des BKU Netzes, bitte die Verbindung zum VPN sicherstellen\n\n" +
-                                        "Nach Herstellen der Verbindung erneut starten\n" +
-                                        "Die Anwendung wird jetzt geschlossen", "VPN verbunden?", MessageBoxButton.OK, MessageBoxImage.Information);
+                                        "Nach Herstellen der Verbindung erneut starten\n", "VPN verbunden?", MessageBoxButton.OK, MessageBoxImage.Information);/*"Die Anwendung wird jetzt geschlossen"*/
                     }
 
-                    Application.Current.Shutdown();
-                    Environment.Exit(0);
+                    //Application.Current.Shutdown();
+                    //Environment.Exit(0);
                 }
             }
 
             if (!conn.IsConnected && conn.IsConnected != lastConn)
             {
-                imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
-                    + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
-                    + ";component/"
-                    + $"Resources/Disconnected.png", UriKind.Absolute));
+                //imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
+                //    + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
+                //    + ";component/"
+                //    + $"Resources/Disconnected.png", UriKind.Absolute));
+                imgConnection.Source = (ImageSource)this.FindResource("NotConnectedIcon");
+                imgSecureConn.Visibility = Visibility.Collapsed;
 
                 imgConnection.ToolTip = $"Verbindung zum Server unterbrochen\n\nEs sind keine Änderungen oder Abfragen möglich";
 
@@ -2493,7 +2512,7 @@ namespace ZKuP
                 idFirma_Besucher = (int)(dc).Row.ItemArray[14];
                 kat = "2";
             }
-
+#pragma warning disable CS0472
             if (idFirma_Besucher != null && idFirma_Besucher != -1)
             {
                 AspInfo aI = new AspInfo(idFirma_Besucher, kat, 2, (dc).Row.ItemArray[0].ToString());
@@ -2503,6 +2522,7 @@ namespace ZKuP
             else
                 MessageBox.Show("Keine gültigen Informationen vorhanden", "Fehler", MessageBoxButton.OK, MessageBoxImage.Information);
         }
+#pragma warning restore CS0472
 
 
 
diff --git a/ZKuP/ManageAsp.xaml.cs b/ZKuP/ManageAsp.xaml.cs
index e5c572d..817f724 100644
--- a/ZKuP/ManageAsp.xaml.cs
+++ b/ZKuP/ManageAsp.xaml.cs
@@ -25,12 +25,12 @@ namespace ZKuP
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private List<Asp> myVar;
-        public List<Asp> aspView
-        {
-            get { return myVar; }
-            set { myVar = value; }
-        }
+        //private List<Asp> myVar;
+        //public List<Asp> aspView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; }
+        //}
 
         DataTable asp = new DataTable("Asp");
         string UserID = "0";
@@ -57,7 +57,7 @@ namespace ZKuP
                 asp = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.ansprechpartner WHERE Name LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR Vertreter LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR Vorgesetzter LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR CreatorID = '{UserID}' ORDER BY Name ASC", asp).Result;
             }
 
-            aspView = Asp.DataTableToAsp(asp);
+            //aspView = Asp.DataTableToAsp(asp);
             dgAsp.DataContext = asp;
         }
 
@@ -217,34 +217,34 @@ namespace ZKuP
         }
     }
 
-    public class Asp
-    {
-        string Name;
-        string Vertreter;
-        string Tel_Nr;
-        string Vorgesetzter;
-        string Tel_Vertreter;
-        string Tel_Vorgesetzter;
+    //public class Asp
+    //{
+    //    string Name;
+    //    string Vertreter;
+    //    string Tel_Nr;
+    //    string Vorgesetzter;
+    //    string Tel_Vertreter;
+    //    string Tel_Vorgesetzter;
 
 
-        public static List<Asp> DataTableToAsp(System.Data.DataTable dataTable)
-        {
-            List<Asp> x = new List<Asp>();
+    //    public static List<Asp> DataTableToAsp(System.Data.DataTable dataTable)
+    //    {
+    //        List<Asp> x = new List<Asp>();
 
-            foreach (DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Asp()
-                {
-                    Name = dr[0].ToString(),
-                    Vertreter = dr[1].ToString(),
-                    Tel_Nr = dr[2].ToString(),
-                    Vorgesetzter = dr[3].ToString(),
-                    Tel_Vertreter = dr[4].ToString(),
-                    Tel_Vorgesetzter = dr[5].ToString()
-                });
-            }
+    //        foreach (DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Asp()
+    //            {
+    //                Name = dr[0].ToString(),
+    //                Vertreter = dr[1].ToString(),
+    //                Tel_Nr = dr[2].ToString(),
+    //                Vorgesetzter = dr[3].ToString(),
+    //                Tel_Vertreter = dr[4].ToString(),
+    //                Tel_Vorgesetzter = dr[5].ToString()
+    //            });
+    //        }
 
-            return x;
-        }
-    }
+    //        return x;
+    //    }
+    //}
 }
diff --git a/ZKuP/ManageDeliveries.xaml.cs b/ZKuP/ManageDeliveries.xaml.cs
index 56ff848..a1f2082 100644
--- a/ZKuP/ManageDeliveries.xaml.cs
+++ b/ZKuP/ManageDeliveries.xaml.cs
@@ -28,12 +28,12 @@ namespace ZKuP
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private List<Deliver> myVar;
-        public List<Deliver> DeliveriesView
-        {
-            get { return myVar; }
-            set { myVar = value; OnPropertyChanged(); }
-        }
+        //private List<Deliver> myVar;
+        //public List<Deliver> DeliveriesView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; OnPropertyChanged(); }
+        //}
         System.Data.DataTable lieferanten = new System.Data.DataTable("lieferanten");
 
         public ManageDeliveries()
@@ -41,7 +41,7 @@ namespace ZKuP
             InitializeComponent();
 
             lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
-            DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
+            //DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
             dgLieferanten.DataContext = lieferanten;
 
             dgLieferanten.Items.SortDescriptions.Clear();
@@ -70,7 +70,7 @@ namespace ZKuP
 
 
                 lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
+                //DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
                 dgLieferanten.ScrollIntoView(dgLieferanten.Items[dgLieferanten.Items.Count - 1]); //scroll to last
                 dgLieferanten.UpdateLayout();
                 ResetInput();
@@ -124,7 +124,7 @@ namespace ZKuP
             dgLieferanten.PreviewKeyDown += DgLieferanten_PreviewKeyDown;
 
             lieferanten = await SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten);
-            DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
+            //DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
         }
 
 
@@ -139,7 +139,7 @@ namespace ZKuP
                 await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.lieferanten WHERE `ID` = '{arr[4]}'");
 
                 lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
+                //DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
             }
         }
 
@@ -160,7 +160,7 @@ namespace ZKuP
                 await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.lieferanten WHERE `ID` = '{arr[4]}'");
 
                 lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
+                //DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
             }
         }
 
@@ -231,32 +231,32 @@ namespace ZKuP
 
 
 
-    public class Deliver
-    {
-        public string Firma;
-        string Fahrer;
-        string Handynr;
-        string Kennzeichen;
+    //public class Deliver
+    //{
+    //    public string Firma;
+    //    string Fahrer;
+    //    string Handynr;
+    //    string Kennzeichen;
 
 
 
 
-        public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
-        {
-            List<Deliver> x = new List<Deliver>();
+    //    public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
+    //    {
+    //        List<Deliver> x = new List<Deliver>();
 
-            foreach (System.Data.DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Deliver()
-                {
-                    Firma = dr[0].ToString(),
-                    Fahrer = dr[1].ToString(),
-                    Handynr = dr[2].ToString(),
-                    Kennzeichen = dr[3].ToString()
-                });
-            }
+    //        foreach (System.Data.DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Deliver()
+    //            {
+    //                Firma = dr[0].ToString(),
+    //                Fahrer = dr[1].ToString(),
+    //                Handynr = dr[2].ToString(),
+    //                Kennzeichen = dr[3].ToString()
+    //            });
+    //        }
 
-            return x;
-        }
-    }
+    //        return x;
+    //    }
+    //}
 }
diff --git a/ZKuP/ManageEntstoerdienste.xaml.cs b/ZKuP/ManageEntstoerdienste.xaml.cs
index 02dbf4b..5583dc6 100644
--- a/ZKuP/ManageEntstoerdienste.xaml.cs
+++ b/ZKuP/ManageEntstoerdienste.xaml.cs
@@ -25,12 +25,12 @@ namespace ZKuP
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private List<Deliver> myVar;
-        public List<Deliver> DeliveriesView
-        {
-            get { return myVar; }
-            set { myVar = value; OnPropertyChanged(); }
-        }
+        //private List<Deliver> myVar;
+        //public List<Deliver> DeliveriesView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; OnPropertyChanged(); }
+        //}
         System.Data.DataTable entstoerdienste = new System.Data.DataTable("entstoerdienste");
 
 
@@ -51,7 +51,7 @@ namespace ZKuP
             cbFirma.ItemsSource = list;
 
             entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
-            DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+            //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
             dgEntstoerdienste.DataContext = entstoerdienste;
 
             dgEntstoerdienste.Items.SortDescriptions.Clear();
@@ -91,7 +91,7 @@ namespace ZKuP
             dgEntstoerdienste.PreviewKeyDown += DgEntstoerdienste_PreviewKeyDown;
 
             entstoerdienste = await SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste);
-            DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+            //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
         }
 
         private async void DgEntstoerdienste_PreviewKeyDown(object sender, KeyEventArgs e)
@@ -105,7 +105,7 @@ namespace ZKuP
                 await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
 
                 entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+                //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
             }
         }
 
@@ -131,7 +131,7 @@ namespace ZKuP
                 await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
 
                 entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+                //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
             }
         }
 
@@ -146,7 +146,7 @@ namespace ZKuP
                 await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
 
                 entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+                //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
             }
         }
 
@@ -185,7 +185,7 @@ namespace ZKuP
 
 
                 entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
-                DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
+                //DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
                 dgEntstoerdienste.ScrollIntoView(dgEntstoerdienste.Items[dgEntstoerdienste.Items.Count - 1]); //scroll to last
                 dgEntstoerdienste.UpdateLayout();
                 ResetInput();
@@ -222,31 +222,31 @@ namespace ZKuP
 
 
 
-public class Deliver
-{
-    public string Firma;
-    string Fahrer;
-    string Handynr;
-    string Kennzeichen;
+//public class Deliver
+//{
+//    public string Firma;
+//    string Fahrer;
+//    string Handynr;
+//    string Kennzeichen;
 
 
 
 
-    public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
-    {
-        List<Deliver> x = new List<Deliver>();
+//    public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
+//    {
+//        List<Deliver> x = new List<Deliver>();
 
-        foreach (System.Data.DataRow dr in dataTable.Rows)
-        {
-            x.Add(new Deliver()
-            {
-                Firma = dr[0].ToString(),
-                Fahrer = dr[1].ToString(),
-                Handynr = dr[2].ToString(),
-                Kennzeichen = dr[3].ToString()
-            });
-        }
+//        foreach (System.Data.DataRow dr in dataTable.Rows)
+//        {
+//            x.Add(new Deliver()
+//            {
+//                Firma = dr[0].ToString(),
+//                Fahrer = dr[1].ToString(),
+//                Handynr = dr[2].ToString(),
+//                Kennzeichen = dr[3].ToString()
+//            });
+//        }
 
-        return x;
-    } 
-}
+//        return x;
+//    } 
+//}
diff --git a/ZKuP/ManageUsers.xaml.cs b/ZKuP/ManageUsers.xaml.cs
index b7f07ec..ca8e4a7 100644
--- a/ZKuP/ManageUsers.xaml.cs
+++ b/ZKuP/ManageUsers.xaml.cs
@@ -37,12 +37,12 @@ namespace ZKuP
             "M2 AM"            
         };
 
-        private List<Users> myVar;
-        public List<Users> UserView
-        {
-            get { return myVar; }
-            set { myVar = value; OnPropertyChanged(); }
-        }
+        //private List<Users> myVar;
+        //public List<Users> UserView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; OnPropertyChanged(); }
+        //}
 
         DataTable userList = new DataTable("userList");
 
@@ -55,7 +55,7 @@ namespace ZKuP
             userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
             userList.DefaultView.Sort = "Username";
             userList = userList.DefaultView.ToTable();
-            UserView = Users.DataTableToUserList(userList);
+            //UserView = Users.DataTableToUserList(userList);
             dgUsers.DataContext = userList;
         }
 
@@ -87,10 +87,10 @@ namespace ZKuP
                 userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
                 userList.DefaultView.Sort = "Username";
                 userList = userList.DefaultView.ToTable();
-                UserView = Users.DataTableToUserList(userList);
+                //UserView = Users.DataTableToUserList(userList);
                 dgUsers.DataContext = userList;
 
-                dgUsers.ScrollIntoView(UserView.Last());
+                //dgUsers.ScrollIntoView(UserView.Last());
             }
             else
                 MessageBox.Show("Der angegebene User existiert bereits!", "User bereits vorhanden", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -136,7 +136,7 @@ namespace ZKuP
                 userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
                 userList.DefaultView.Sort = "Username asc";
                 userList = userList.DefaultView.ToTable();
-                UserView = Users.DataTableToUserList(userList);
+                //UserView = Users.DataTableToUserList(userList);
             }
         }
 
@@ -160,7 +160,7 @@ namespace ZKuP
                 userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
                 userList.DefaultView.Sort = "Username";
                 userList = userList.DefaultView.ToTable();
-                UserView = Users.DataTableToUserList(userList);
+                //UserView = Users.DataTableToUserList(userList);
                 dgUsers.DataContext = userList;
             }
         }
@@ -188,26 +188,26 @@ namespace ZKuP
     }
 
 
-    public class Users
-    {
-        string Username;
-        string Role;
+    //public class Users
+    //{
+    //    string Username;
+    //    string Role;
 
 
-        public static List<Users> DataTableToUserList(System.Data.DataTable dataTable)
-        {
-            List<Users> x = new List<Users>();
+    //    public static List<Users> DataTableToUserList(System.Data.DataTable dataTable)
+    //    {
+    //        List<Users> x = new List<Users>();
 
-            foreach (DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Users()
-                {
-                    Username = dr[1].ToString(),
-                    Role = dr[2].ToString()
-                });
-            }
+    //        foreach (DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Users()
+    //            {
+    //                Username = dr[1].ToString(),
+    //                Role = dr[2].ToString()
+    //            });
+    //        }
 
-            return x;
-        }
-    }
+    //        return x;
+    //    }
+    //}
 }
diff --git a/ZKuP/ManageVisitor.xaml.cs b/ZKuP/ManageVisitor.xaml.cs
index aa7ffa9..c7fbcd2 100644
--- a/ZKuP/ManageVisitor.xaml.cs
+++ b/ZKuP/ManageVisitor.xaml.cs
@@ -28,12 +28,12 @@ namespace ZKuP
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private List<Visitor> myVar;
-        public List<Visitor> VisitorView
-        {
-            get { return myVar; }
-            set { myVar = value; OnPropertyChanged(); }
-        }
+        //private List<Visitor> myVar;
+        //public List<Visitor> VisitorView
+        //{
+        //    get { return myVar; }
+        //    set { myVar = value; OnPropertyChanged(); }
+        //}
 
         DataTable visitors = new DataTable("Visitors");
         private Dictionary<string, List<string>> visitorSearchList = new Dictionary<string, List<string>>();
@@ -96,7 +96,7 @@ namespace ZKuP
                     $"OR Ansprechpartner_Intern = '{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}' ORDER BY Name ASC"
                     , visitors).Result;
 
-            VisitorView = Visitor.DataTableToVisitor(visitors);
+            //VisitorView = Visitor.DataTableToVisitor(visitors);
             dgVisitors.DataContext = visitors;
 
 
@@ -118,7 +118,7 @@ namespace ZKuP
         private void requestListAdmin()
         {
             visitors = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.besucher ORDER BY Name ASC", visitors).Result;
-            VisitorView = Visitor.DataTableToVisitor(visitors);
+            //VisitorView = Visitor.DataTableToVisitor(visitors);
             dgVisitors.DataContext = visitors;
 
             visitorSearchList.Clear();
@@ -693,7 +693,7 @@ namespace ZKuP
             {
                 visitors.DefaultView.RowFilter = $"";
 
-                Task.Run(() => VisitorView = Visitor.DataTableToVisitor(visitors));
+                //Task.Run(() => VisitorView = Visitor.DataTableToVisitor(visitors));
                 dgVisitors.DataContext = visitors;
             }
             else
@@ -875,42 +875,42 @@ namespace ZKuP
     }
 
 
-    public class Visitor
-    {
-        public string Name;
-        string Verantwortlicher_MA;
-        string Tel_Nr_Besucher;
-        string Anzahl_Begleitpersonen;
-        string Besuchstag;
-        string Grund_des_Besuchs;
-        string Oertlichkeit;
-        string Ansprechpartner_Intern;
-        string Tel_Nr_Ansprechpartner_Intern;
+    //public class Visitor
+    //{
+    //    public string Name;
+    //    string Verantwortlicher_MA;
+    //    string Tel_Nr_Besucher;
+    //    string Anzahl_Begleitpersonen;
+    //    string Besuchstag;
+    //    string Grund_des_Besuchs;
+    //    string Oertlichkeit;
+    //    string Ansprechpartner_Intern;
+    //    string Tel_Nr_Ansprechpartner_Intern;
 
 
 
 
-        public static List<Visitor> DataTableToVisitor(System.Data.DataTable dataTable)
-        {
-            List<Visitor> x = new List<Visitor>();
+    //    public static List<Visitor> DataTableToVisitor(System.Data.DataTable dataTable)
+    //    {
+    //        List<Visitor> x = new List<Visitor>();
 
-            foreach (DataRow dr in dataTable.Rows)
-            {
-                x.Add(new Visitor()
-                {
-                    Name = dr[1].ToString(),
-                    Verantwortlicher_MA = dr[2].ToString(),
-                    Tel_Nr_Besucher = dr[3].ToString(),
-                    Anzahl_Begleitpersonen = dr[4].ToString(),
-                    Besuchstag = dr[5].ToString(),
-                    Grund_des_Besuchs = dr[6].ToString(),
-                    Ansprechpartner_Intern = dr[7].ToString(),
-                    Tel_Nr_Ansprechpartner_Intern = dr[8].ToString(),
-                    Oertlichkeit = dr[9].ToString()
-                });
-            }
+    //        foreach (DataRow dr in dataTable.Rows)
+    //        {
+    //            x.Add(new Visitor()
+    //            {
+    //                Name = dr[1].ToString(),
+    //                Verantwortlicher_MA = dr[2].ToString(),
+    //                Tel_Nr_Besucher = dr[3].ToString(),
+    //                Anzahl_Begleitpersonen = dr[4].ToString(),
+    //                Besuchstag = dr[5].ToString(),
+    //                Grund_des_Besuchs = dr[6].ToString(),
+    //                Ansprechpartner_Intern = dr[7].ToString(),
+    //                Tel_Nr_Ansprechpartner_Intern = dr[8].ToString(),
+    //                Oertlichkeit = dr[9].ToString()
+    //            });
+    //        }
 
-            return x;
-        }
-    }
-    }
+    //        return x;
+    //    }
+    //}
+}
diff --git a/ZKuP/Resources/ConnectedSecure.png b/ZKuP/Resources/ConnectedSecure.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdc66255c8f2c78661a62e012371a69a2589cb42
GIT binary patch
literal 5818
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
aP6c*0E(l)o>4svo>i|(&25(1-w(8$>p?!P+

literal 0
HcmV?d00001

diff --git a/ZKuP/Resources/Lock.png b/ZKuP/Resources/Lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..82a6bde4837b0d721d9f3f9036f94b2e15994241
GIT binary patch
literal 1636
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

literal 0
HcmV?d00001

diff --git a/ZKuP/SQL.cs b/ZKuP/SQL.cs
index d4b8ea5..2949b0f 100644
--- a/ZKuP/SQL.cs
+++ b/ZKuP/SQL.cs
@@ -19,10 +19,12 @@ namespace ZKuP
     {
         private static string p = "fNZG8bO+b8lbajxNUCPCIRNBap4/T5N5Qoa0Rec3P9b2EiwC5eNIwfEMjR5Fvc/W";
         private static string s = "KYgjkRVn0edFDca2GbZq/A==";
-        private static string u = "F/u2njMf6aE4krZGTjzgZw==";
         private static string uSSL = "miSRZrFLxAAWlzRLx9B6Ww==";
         private static string d = "xWb4X9gPEzwe76zqpysF3w==";
+#if DEBUG
+        private static string u = "F/u2njMf6aE4krZGTjzgZw==";
         private static string dTest = "e+tv3ZaP+cewOJgE7jNNlA==";
+#endif
         //static MySqlConnection conn = new MySqlConnection(GetConnstr());
         //private static MySqlConnection _conn;
         //public static MySqlConnection conn
@@ -61,8 +63,6 @@ namespace ZKuP
                     isOnline = false;
                     return false;
                 }
-                isOnline = false;
-                return false;
             }
         }
 
@@ -91,7 +91,6 @@ namespace ZKuP
                     System.Windows.Application.Current.Shutdown();
                     return false;
                 }
-                return false;
             }
         }
 
@@ -113,7 +112,7 @@ namespace ZKuP
             return $"Server={GetIP()};" +
                 $"Uid={Crypto.Decrypt(Crypto.GetHashKey("8734FCD0D69756D3AE7154E69F8042CA"), uSSL)};" +
                 $"Pwd={Crypto.Decrypt(Crypto.GetHashKey("71A209CC81FDB2F458C4EC8DF7090154"), p)};" +
-                $"database={Crypto.Decrypt(Crypto.GetHashKey("B79DE37BC846D9B1054EE837AAA45D83"), dTest)}" +
+                $"database={Crypto.Decrypt(Crypto.GetHashKey("8EB0CC56E502BFC5C19F6A0A0A53D543"), d)}" +
                 $";SslMode=Required;{(withTimeout ? "Connection Timeout = 10" : "")}";
 
 //Ohne SSL
@@ -124,12 +123,12 @@ namespace ZKuP
             //    $";{(withTimeout ? "Connection Timeout = 10" : "")}";
 
 #elif DEBUG
-            //Ohne SSL
+            ////Ohne SSL
             //return $"Server={GetIP()};" +
             //    $"Uid={Crypto.Decrypt(Crypto.GetHashKey("990C535389C3A18FFD44951DAA291161"), u)};" +
             //    $"Pwd={Crypto.Decrypt(Crypto.GetHashKey("71A209CC81FDB2F458C4EC8DF7090154"), p)};" +
             //    $"database={Crypto.Decrypt(Crypto.GetHashKey("B79DE37BC846D9B1054EE837AAA45D83"), dTest)}" +
-            //    $";{(withTimeout ? "Connection Timeout = 10" : "")}";
+            //    $";SslMode=none;{(withTimeout ? "Connection Timeout = 10" : "")}";
 
 
             //Mit SSL
@@ -152,27 +151,40 @@ namespace ZKuP
             return new MySqlConnection(GetConnstr());
         }
 
-        internal static void GetCipher()
+        internal static bool IsSecureConnection()
         {
-#if DEBUG
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
+            //#if DEBUG
+            using (var conn = GetConnection())
+            {
+                conn.Open();
 
-                    var cmd = new MySqlCommand("SHOW STATUS LIKE 'Ssl_cipher'", conn);
-                    using (var reader = cmd.ExecuteReader())
+                var cmd = new MySqlCommand("SHOW STATUS LIKE 'Ssl_cipher'", conn);
+                using (var reader = cmd.ExecuteReader())
+                {
+                    string varName = "";
+                    string varValue = "";
+
+                    while (reader.Read())
                     {
-                        while (reader.Read())
-                        {
-                            string varName = reader.GetString(0);  // Variable_name
-                            string varValue = reader.GetString(1); // Value
-                            Console.WriteLine($"{varName}: {varValue}");
-                        }
+                        varName = reader.GetString(0);  // Variable_name
+                        varValue = reader.GetString(1); // Value
+                        Console.WriteLine($"{varName}: {varValue}");
                     }
 
+
                     conn.Close();
+
+                    if (varValue == "ECDHE-RSA-AES256-GCM-SHA384")
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
-#endif
+            }
+            //#endif
         }
 
         public static bool TestConnection()
@@ -627,8 +639,8 @@ namespace ZKuP
             var conn = GetConnection();
 
             MySqlCommand cmd = new MySql.Data.MySqlClient.MySqlCommand(SQLCommand, conn);
-            UInt32 FileSize;
-            byte[] rawData;
+            //UInt32 FileSize;
+            //byte[] rawData;
             System.Drawing.Bitmap image = null;
 
             using (conn)
diff --git a/ZKuP/Signature.xaml.cs b/ZKuP/Signature.xaml.cs
index a5a2431..2f5e1f5 100644
--- a/ZKuP/Signature.xaml.cs
+++ b/ZKuP/Signature.xaml.cs
@@ -40,7 +40,7 @@ namespace ZKuP
 
             try
             {
-                var dev = 1;
+                //var dev = 1;
                 if (signoPad._stPad.DeviceGetCount() <= 0)
                 {
                     MessageBox.Show("Kein Unterschriftenpad gefunden\nMeldung 0x04", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -109,15 +109,15 @@ namespace ZKuP
 
         private void btnConfirm_Click(object sender, RoutedEventArgs e)
         {
-            System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Tiff;
-            SignatureImageFlag options = signotec.STPadLibNet.SignatureImageFlag.Timestamp | signotec.STPadLibNet.SignatureImageFlag.TimestampRelToImage | signotec.STPadLibNet.SignatureImageFlag.DontSmooth; ;
+            //System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Tiff;
+            //SignatureImageFlag options = signotec.STPadLibNet.SignatureImageFlag.Timestamp | signotec.STPadLibNet.SignatureImageFlag.TimestampRelToImage | signotec.STPadLibNet.SignatureImageFlag.DontSmooth; ;
 
 
-            int resolution = 300;
-            int width = 0;
-            int height = 0;
-            int penWidth = 0;
-            System.Drawing.Color penColor = System.Drawing.Color.FromArgb(255, 0, 0, 0);
+            //int resolution = 300;
+            //int width = 0;
+            //int height = 0;
+            //int penWidth = 0;
+            //System.Drawing.Color penColor = System.Drawing.Color.FromArgb(255, 0, 0, 0);
 
 
             try
diff --git a/ZKuP/ZKuP.csproj b/ZKuP/ZKuP.csproj
index dc55bac..ec895d2 100644
--- a/ZKuP/ZKuP.csproj
+++ b/ZKuP/ZKuP.csproj
@@ -88,6 +88,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
     <WarningsAsErrors>1030</WarningsAsErrors>
+    <NoWarn>4014,1998,0108</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>3C16B2C32C7121098E02D5B8C9B97FB987E781D1</ManifestCertificateThumbprint>
@@ -861,5 +862,11 @@
   <ItemGroup>
     <Resource Include="Resources\ConnBackground.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ConnectedSecure.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Lock.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file