Namensbezeichungen in JS Filltable-Funktionen wurden verbessert sowie Popper.js aktualisiert, sodass eine Integrität mit Bootstrap 5.0.2 vorliegt sowie der Hashalgorithmus wurde sicherherheitsrelevant verbessert.
This commit is contained in:
@@ -14,7 +14,10 @@
|
|||||||
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
|
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
|
||||||
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
|
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
|
||||||
<script src="js/netzwerk.js" type="text/javascript"></script>
|
<script src="js/netzwerk.js" type="text/javascript"></script>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||||
<link rel="stylesheet" type="text/css" href="../css/main.css"/>
|
<link rel="stylesheet" type="text/css" href="../css/main.css"/>
|
||||||
|
|||||||
@@ -625,7 +625,9 @@
|
|||||||
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
|
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
|
||||||
|
|
||||||
<!-- Popper.JS -->
|
<!-- Popper.JS -->
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
<!-- Bootstrap JS -->
|
<!-- Bootstrap JS -->
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -328,7 +328,10 @@
|
|||||||
End Try %>
|
End Try %>
|
||||||
<div></div></div>
|
<div></div></div>
|
||||||
</ContentTemplate><Triggers><asp:AsyncPostBackTrigger ControlID="btn_Auftraege" EventName="Click"/></Triggers></asp:UpdatePanel>
|
</ContentTemplate><Triggers><asp:AsyncPostBackTrigger ControlID="btn_Auftraege" EventName="Click"/></Triggers></asp:UpdatePanel>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
|
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
|
||||||
<script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
|
<script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, impe
|
|||||||
<p>
|
<p>
|
||||||
<asp:Button ID="Btn_btn" ClientIDMode="AutoID" runat="server" OnClick="Btn_btn_Click"/>
|
<asp:Button ID="Btn_btn" ClientIDMode="AutoID" runat="server" OnClick="Btn_btn_Click"/>
|
||||||
</p>
|
</p>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
</ContentTemplate></asp:UpdatePanel>
|
</ContentTemplate></asp:UpdatePanel>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
||||||
|
|||||||
@@ -88,6 +88,9 @@
|
|||||||
var slider = document.getElementById('<%=sld_getbenchmarkheat.ClientID%>');
|
var slider = document.getElementById('<%=sld_getbenchmarkheat.ClientID%>');
|
||||||
$('<%=lbl_valslider.ClientID%>').change(function () { slider.value = parseInt(this.value) });
|
$('<%=lbl_valslider.ClientID%>').change(function () { slider.value = parseInt(this.value) });
|
||||||
</script>
|
</script>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
||||||
|
|||||||
@@ -249,6 +249,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
</ContentTemplate></asp:UpdatePanel>
|
</ContentTemplate></asp:UpdatePanel>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
||||||
|
|||||||
@@ -339,11 +339,11 @@
|
|||||||
let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder_M.ClientID%>');
|
let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder_M.ClientID%>');
|
||||||
let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>');
|
let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>');
|
||||||
alert(id)
|
alert(id)
|
||||||
let table = document.getElementById('<%=tbl_mainpage_M.ClientID%>');
|
let table_M = document.getElementById('<%=tbl_mainpage_M.ClientID%>');
|
||||||
var rowCount = table.rows.length;
|
var rowCount = table_M.rows.length;
|
||||||
|
|
||||||
for (let i = rowCount - 1; i > 0; i--) {
|
for (let i = rowCount - 1; i > 0; i--) {
|
||||||
table.deleteRow(i);
|
table_M.deleteRow(i);
|
||||||
}
|
}
|
||||||
Speditionslabel.textContent = id.split(',')[0];
|
Speditionslabel.textContent = id.split(',')[0];
|
||||||
natplaceholder.textContent = id.split(',')[1];
|
natplaceholder.textContent = id.split(',')[1];
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ Partial Class LKWS
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
<WebMethod>
|
<WebMethod>
|
||||||
<ScriptMethod(ResponseFormat:=ResponseFormat.Json)>
|
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
|
||||||
Public Sub filltable2(Kennzeichen As String)
|
Public Sub filltable2(Kennzeichen As String)
|
||||||
Dim tbl As Table = New Table
|
Dim tbl As Table = New Table
|
||||||
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen)
|
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen)
|
||||||
@@ -423,7 +423,7 @@ Partial Class LKWS
|
|||||||
Next
|
Next
|
||||||
End Sub
|
End Sub
|
||||||
<WebMethod>
|
<WebMethod>
|
||||||
<ScriptMethod(ResponseFormat:=ResponseFormat.Json)>
|
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
|
||||||
Public Sub filltable_M(Kennzeichen As String)
|
Public Sub filltable_M(Kennzeichen As String)
|
||||||
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen)
|
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen)
|
||||||
Dim Tbl As New Table
|
Dim Tbl As New Table
|
||||||
|
|||||||
@@ -11,7 +11,10 @@
|
|||||||
<link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
|
<link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
|
||||||
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
|
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
|
||||||
<script src="js/netzwerk.js" type="text/javascript"></script>
|
<script src="js/netzwerk.js" type="text/javascript"></script>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||||
|
|
||||||
|
|||||||
@@ -14,9 +14,7 @@
|
|||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||||
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
||||||
<!-- Bootstrap CSS -->
|
|
||||||
<!--<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">-->
|
|
||||||
<link href="bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
|
||||||
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
||||||
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
@@ -400,5 +398,9 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -16,12 +16,13 @@
|
|||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||||
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
|
||||||
<!--<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">-->
|
|
||||||
|
|
||||||
<link href="bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
<link href="bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||||
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" ></script>
|
<!-- Popper.JS -->
|
||||||
|
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>-->
|
||||||
|
<!-- Production version -->
|
||||||
|
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
<title>VERAG Spedition AG Login</title>
|
<title>VERAG Spedition AG Login</title>
|
||||||
<link rel="stylesheet" type="text/css" href="../css/main.css"/>
|
<link rel="stylesheet" type="text/css" href="../css/main.css"/>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<form id="form1" runat="server">
|
<form id="form1" runat="server">
|
||||||
<div>
|
<div>
|
||||||
<h1>Du wurdest erfolgreich ausgeloggt.</h1>
|
<h1>Du wurdest erfolgreich ausgeloggt.</h1>
|
||||||
<button type="button" id="btn_backtostart" class="btn btn-primary">Zurück zur Startseite!</button>
|
<button type="button" id="btn_backtostart" runat="server" class="btn btn-primary">Zurück zur Startseite!</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
|
|
||||||
Imports System.Web.Configuration
|
Imports System.Web.Configuration
|
||||||
|
Imports System.Security.Cryptography
|
||||||
|
|
||||||
Partial Class login_Logout
|
Partial Class login_Logout
|
||||||
Inherits System.Web.UI.Page
|
Inherits System.Web.UI.Page
|
||||||
|
|
||||||
Dim sessionname
|
Dim sessionname
|
||||||
Sub Page_Load() Handles Me.Load
|
|
||||||
|
Function Page_Load() As Threading.Tasks.Task Handles Me.Load
|
||||||
FormsAuthentication.SignOut()
|
FormsAuthentication.SignOut()
|
||||||
Session.Clear()
|
Session.Clear()
|
||||||
Session.Abandon()
|
Session.Abandon()
|
||||||
@@ -21,14 +22,10 @@ Partial Class login_Logout
|
|||||||
'cookie2.Expires = DateTime.Now.AddYears(-1)
|
'cookie2.Expires = DateTime.Now.AddYears(-1)
|
||||||
'Response.Cookies.Add(cookie2)
|
'Response.Cookies.Add(cookie2)
|
||||||
Response.BufferOutput = True
|
Response.BufferOutput = True
|
||||||
|
End Function
|
||||||
|
|
||||||
|
|
||||||
|
Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs) Handles btn_backtostart.ServerClick
|
||||||
Response.Redirect("../login/login_FLEX.aspx")
|
Response.Redirect("../login/login_FLEX.aspx")
|
||||||
|
|
||||||
|
|
||||||
End Sub
|
|
||||||
|
|
||||||
|
|
||||||
Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs)
|
|
||||||
Response.Redirect("../login/login_FLEX.aspx")
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Partial Class login_FLEX
|
|||||||
Else
|
Else
|
||||||
Try
|
Try
|
||||||
Dim teststr = String.Empty
|
Dim teststr = String.Empty
|
||||||
intzahliterats = 4
|
intzahliterats = VERAG_VARIABLES.RandomInteger(2, Math.Pow(2, 3))
|
||||||
teststr = Await TestPerformance.TestHashrateServerAsync(VERAG_VARIABLES.RandomInteger(2, Math.Pow(2, 2)))
|
teststr = Await TestPerformance.TestHashrateServerAsync(VERAG_VARIABLES.RandomInteger(2, Math.Pow(2, 2)))
|
||||||
If String.Equals(teststr, String.Empty) = False Then
|
If String.Equals(teststr, String.Empty) = False Then
|
||||||
intzahliterats = VERAG_VARIABLES.getiterationnumber
|
intzahliterats = VERAG_VARIABLES.getiterationnumber
|
||||||
|
|||||||
Reference in New Issue
Block a user