diff --git a/Customers/Customers.master b/Customers/Customers.master
index ac12598..ca5f02c 100644
--- a/Customers/Customers.master
+++ b/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
diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 212b723..a4d9b0a 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -100,6 +100,7 @@
+
-
<% End If
@@ -236,7 +239,7 @@
$("#container2").hide();
}
});
- });
+ });
+
+
+
+
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 51dc31b..b5f4d8f 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/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)
- Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
- ' MsgBox(ersterdat)
- datevon = ersterdat
- pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
- 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
+ pickdate1.BorderColor = Drawing.Color.Red
+ pickdate1.BorderStyle = BorderStyle.Double
+ pickdate1.BorderWidth = Unit.Pixel(2)
+ pickdate2.BorderColor = Drawing.Color.Red
+ pickdate2.BorderStyle = BorderStyle.Double
+ pickdate2.BorderWidth = Unit.Pixel(2)
+ 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
diff --git a/Web.config b/Web.config
index 904ee1b..3848068 100644
--- a/Web.config
+++ b/Web.config
@@ -27,7 +27,7 @@
-
+
+
+
+
+
+
+
@@ -111,6 +117,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/admin/addHp.aspx.vb b/admin/addHp.aspx.vb
index ac124fa..6d97b19 100644
--- a/admin/addHp.aspx.vb
+++ b/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"
@@ -7,7 +9,7 @@ Partial Class admin_InputBox
Dim hp_content As hp_content = Nothing
-
+
Public Overrides Sub VerifyRenderingInServerForm(control As Control)
@@ -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
@@ -44,19 +61,19 @@ Partial Class admin_InputBox
Protected Sub addPage_Click(sender As Object, e As EventArgs) Handles addPage.Click
-
+
Dim hp_content As hp_content = Nothing
hp_content = Page.Session("hp_content") 'sonst gehs ned, weil werte nicht geladen sind
' Dim title = InputBox("Bitte geben Sie den deutschen Menü-Titel an:")
' System.Web.HttpContext.Current.Response.Write("")
Dim title As String = input.Text
-
+
If title <> "" Then
'Request.QueryString("menuID")
Dim menueId As Integer = -1
menueId = DB.insert_HPContentNew(hp_content, laenderkuerzel, title, hp_content.hp_id, hp_content.hp_instance)
'Page.Parent.Page.Response.Redirect("admin.aspx?menuId=" & menueId & "&lan=" & laenderkuerzel)
-
+
Page.Session("parentReload") = "admin.aspx?menuID=" & menueId & "&lan=" & laenderkuerzel
Else
diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css
index b902ef8..16412f4 100644
--- a/css/Customers/CustomerAVISO.css
+++ b/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;
diff --git a/packages.config b/packages.config
index 2a45739..737427f 100644
--- a/packages.config
+++ b/packages.config
@@ -1,8 +1,12 @@
+
+
+
+
@@ -18,10 +22,14 @@
+
-
+
+
+
+
\ No newline at end of file
diff --git a/sendFeedback.aspx b/sendFeedback.aspx
index a713174..213de5d 100644
--- a/sendFeedback.aspx
+++ b/sendFeedback.aspx
@@ -16,7 +16,7 @@
-
+
Verag Feedback Panel
@@ -31,15 +31,15 @@