Fixen des Accordion-Schließen Bug

Customers/Customers.master

@@ -31,6 +31,11 @@
         Sub Page_Load() Handles Me.Load
             'Login-Validierung
             If Not Me.Page.User.Identity.IsAuthenticated Then
+                Try
+                    FormsAuthentication.RedirectFromLoginPage(Me.Page.User.Identity.Name, True)
+                Catch ex As Exception
+
+                End Try
                 FormsAuthentication.RedirectToLoginPage()
             End If
 

Customers/CustomsAviso.aspx

@@ -100,6 +100,7 @@
                                 </div>                                  
                             </div> 
                                 </div>
+                                <asp:HiddenField ID="hfAccordionIndex" runat="server" />
                              <div style="height:0.936768149882904vh"></div>           
                             <div class="col-12" id="cont4">
                             <div class="col-12" id="container2" style="margin-left:2px">                                                                     
@@ -108,10 +109,12 @@
                                    
                                             <asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> 
                                             <asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:TextBox>
+                                <asp:Label ID="lbl_ErrorCal" runat="server" Text=""></asp:Label>
                                          </div>                                    
                              <div id="Abstand"></div>  
                               <hr>
-                                <div id="accordion">
+
+                                 
                                  <div class="accordion" id="accordionExample">
                                       <div class="accordion-item">
                                         <h2 class="accordion-header" id="headingOne">
@@ -119,7 +122,7 @@
                                           </h2>
                                         </div>
                                
-                                        <div id="collapseOne" class="accordion-collapse collapse hide" aria-labelledby="headingOne" data-bs-parent="#accordionExample">   
+                                        <div id="collapseOne" class="accordion-collapse" aria-labelledby="headingOne" data-bs-parent="#accordionExample">   
                                                     <div class="card card-body">
                                                      <div class="col-12" id="cont3">                                  
                                                          <div class="container">                                
@@ -187,7 +190,7 @@
                                                         </asp:Table>                                                  
                                                                                             
                                            </div> 
-                            </div></div></div>
+                            </div></div>
                        </div>                                              
                           <br /><br /><br />
                    <%                 End If
@@ -236,7 +239,7 @@
                       $("#container2").hide();
                   }
            });
-        });       
+       });
    </script>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -248,4 +251,36 @@
 
         });
     </script> 
+       
+    <script>
+        $(document).ready(function () {
+            $(".accordion .accordion-collapse").on('shown.bs.collapse', function () {
+                var active = $(this).attr('id');
+                var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels);
+                if ($.inArray(active, panels) == -1) //check that the element is not in the array
+                    panels.push(active);
+                localStorage.panels = JSON.stringify(panels);
+            });
+
+            $(".accordion .accordion-collapse").on('hidden.bs.collapse', function () {
+                var active = $(this).attr('id');
+                var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels);
+                var elementIndex = $.inArray(active, panels);
+                if (elementIndex !== -1) //check the array
+                {
+                    panels.splice(elementIndex, 1); //remove item from array
+                }
+                localStorage.panels = JSON.stringify(panels); //save array on localStorage
+            });
+
+            var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels); //get all panels
+            for (var i in panels) { //<-- panel is the name of the cookie
+                if ($("#" + panels[i]).hasClass('accordion-collapse')) // check if this is a panel
+                {
+                    $("#" + panels[i]).collapse("show");
+                }
+            }
+        });
+    </script>
+
 </asp:Content>

Customers/CustomsAviso.aspx.vb

@@ -22,16 +22,9 @@ Partial Class Kundenbereich_Default
             normaltable.EnableViewState = True
             datevon = Date.Parse(pickdate1.Text)
             datebis = Date.Parse(pickdate2.Text)
-
         Else
             normaltable.EnableViewState = True
-            Dim erster = New Date(Now().Year, Now().Month, 1)
+
-            Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-            pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-            ' MsgBox(ersterdat)
-            datevon = ersterdat
-            datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-            pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
             rbt_Alle.Selected = True
             rbt_Alle_M.Selected = True
 
@@ -223,16 +216,24 @@ Partial Class Kundenbereich_Default
         If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
             pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {0, 1, 2, 3, 4, 5}, datevon, datebis, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                 Try
-                    Dim erster = New Date(Now().Year, Now().Month, 1)
+                    pickdate1.BorderColor = Drawing.Color.Red
-                    Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+                    pickdate1.BorderStyle = BorderStyle.Double
-                    ' MsgBox(ersterdat)
+                    pickdate1.BorderWidth = Unit.Pixel(2)
-                    datevon = ersterdat
+                    pickdate2.BorderColor = Drawing.Color.Red
-                    pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+                    pickdate2.BorderStyle = BorderStyle.Double
-                    datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+                    pickdate2.BorderWidth = Unit.Pixel(2)
-                    pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+                    lbl_ErrorCal.Visible = True
+                    lbl_ErrorCal.Style.Add("ForeColor", "red")
+                    lbl_ErrorCal.Text = "Kein Datum ausgewählt. Bitte auswählen!"
+
+
+
+
+
+
                 Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year
                     MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
                 End Try
@@ -240,6 +241,10 @@ Partial Class Kundenbereich_Default
                 Try
                     datevon = Date.Parse(pickdate1.Text)
                     datebis = Date.Parse(pickdate2.Text)
+                    pickdate1.BorderWidth = Unit.Pixel(0)
+                    pickdate2.BorderWidth = Unit.Pixel(0)
+                    lbl_ErrorCal.Visible = False
+                    lbl_ErrorCal.Text = ""
                 Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year
                     MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
                 End Try
@@ -378,7 +383,7 @@ Partial Class Kundenbereich_Default
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
         'Mobil
-        rbt_Alle_M.Selected = True
+        rbt_Alle_M.Selected = False
         rbt_Alle_M.Enabled = True
         rbt_Ankunft_M.Selected = False
         rbt_Ankunft_M.Enabled = True
@@ -395,7 +400,7 @@ Partial Class Kundenbereich_Default
         txt_KdNrAuftrag_M.Text = ""
         txt_LKWNr_M.Text = ""
         'Desktop
-        rbt_Alle.Selected = True
+        rbt_Alle.Selected = False
         rbt_Alle.Enabled = True
         rbt_Ankunft.Selected = False
         rbt_Ankunft.Enabled = True

Web.config

@@ -27,7 +27,7 @@
     <authentication mode="Forms">
       <forms defaultUrl="admin/admin.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880" />
     </authentication>
-    <sessionState mode="InProc" timeout="2880" cookieless="true" regenerateExpiredSessionId="true" compressionEnabled="true" />
+    <sessionState mode="InProc" timeout="2880" cookieless="AutoDetect" regenerateExpiredSessionId="true" compressionEnabled="true" />
     <httpRuntime requestValidationMode="2.0" />
     <pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" />
     <!--<securityPolicy>
@@ -50,6 +50,12 @@
     <add assembly="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30AD4FE6B2A6AEED" /> -->
         <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
         <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       </assemblies>
     </compilation>
     <membership defaultProvider="MySqlMembershipProvider">
@@ -111,6 +117,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

admin/addHp.aspx.vb

@@ -1,4 +1,6 @@
 
+Imports Ganss.XSS
+
 Partial Class admin_InputBox
     Inherits System.Web.UI.Page
     Public laenderkuerzel As String = "de"
@@ -26,6 +28,21 @@ Partial Class admin_InputBox
                 laenderkuerzel = "de"
             End If
 
+            ' Dim arrayoftags(5) As String
+            'arrayoftags(0) = "a"
+            'arrayoftags(1) = "div"
+            'arrayoftags(2) = "iframe"
+            'Dim arrayofattrs(20) As String
+            'arrayofattrs(0) = "a"
+            'Dim uriattributes(5) As String
+            'uriattributes(0) = "Par1"
+            'Dim allowedcssprops(15) As String
+            'allowedcssprops(0) = ""
+
+            'Dim sanitizer = New HtmlSanitizer(arrayoftags, Nothing, arrayofattrs, uriattributes, allowedcssprops)
+
+            'Dim cleanHtml As String
+            'sanitizer.AllowDataAttributes = True
 
 
             If Not Request.QueryString("menuID") Is Nothing Then
@@ -35,7 +52,7 @@ Partial Class admin_InputBox
             End If
 
             hp_content = DB.qry_contentNew(menueId, laenderkuerzel)
-
+            'cleanHtml = sanitizer.Sanitize(hp_content.ToString)
             Page.Session("hp_content") = hp_content
 
 

css/Customers/CustomerAVISO.css

@@ -42,7 +42,7 @@ hr{
     border: none;
     border-radius: 0;   
     transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease;  
-    height:6px;
+    height:5px;
 }
 .accordion #accordionExample #collapseOne .card card-body #cont3 .container {
     margin-left: 2px;

packages.config

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AngleSharp" version="0.16.0" targetFramework="net47" />
+  <package id="AngleSharp.Css" version="0.16.1" targetFramework="net47" />
+  <package id="AntiXSS.NetStandard.HtmlSanitization" version="0.1.125" targetFramework="net47" />
   <package id="bootstrap" version="5.0.2" targetFramework="net47" />
   <package id="CompareNETObjects" version="4.73.0" targetFramework="net47" />
   <package id="DotNetZip" version="1.15.0" targetFramework="net47" />
+  <package id="HtmlSanitizer" version="6.0.441" targetFramework="net47" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="3.0.0" targetFramework="net47" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.Common" version="3.9.0" targetFramework="net47" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="3.9.0" targetFramework="net47" />
@@ -18,10 +22,14 @@
   <package id="System.Buffers" version="4.5.1" targetFramework="net47" />
   <package id="System.Collections" version="4.3.0" targetFramework="net47" />
   <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net47" />
+  <package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net47" />
   <package id="System.Memory" version="4.5.4" targetFramework="net47" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
   <package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net47" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" />
-  <package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net47" />
+  <package id="System.Security.AccessControl" version="4.7.0" targetFramework="net47" />
+  <package id="System.Security.Permissions" version="4.7.0" targetFramework="net47" />
+  <package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net47" />
+  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net47" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
 </packages>

sendFeedback.aspx

@@ -105,7 +105,7 @@
 
         End Sub
 
-         Function SendEmail() As Boolean
+        Function SendEmail() As Boolean
             Dim Msg As New MailMessage
             Dim myCredentials As New System.Net.NetworkCredential
             myCredentials.UserName = "al@verag.ag"
@@ -125,7 +125,7 @@
                 '     Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx")
                 '     Msg.Attachments.Add(attachment)
                 '     mySmtpsvr.Send(Msg)
-                   MsgBox("SENT")
+                MsgBox("SENT")
                 Return True
             Catch ex As Exception
                 MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt