edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
ja
2022-01-03 09:07:48 +01:00
parent 939c4b6827
commit 711bfdcd45
14 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Customers/Cards_Boxes.aspx
View File

@@ -14,7 +14,10 @@
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
<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 -->
<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"/>

6
Customers/Customers.master
View File

@@ -624,8 +624,10 @@
<!-- JQUERY Script fuer Modal-->
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<!-- 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>
<!-- 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 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>

5
Customers/CustomsAviso.aspx
View File

@@ -328,7 +328,10 @@
End Try %>
<div></div></div>
</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="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
<script>

4
Customers/Default.aspx
View File

@@ -46,6 +46,10 @@ Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, impe
<p>
<asp:Button ID="Btn_btn" ClientIDMode="AutoID" runat="server" OnClick="Btn_btn_Click"/>
</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>
</asp:Content>

5
Customers/Default2.aspx
View File

@@ -88,6 +88,9 @@
var slider = document.getElementById('<%=sld_getbenchmarkheat.ClientID%>');
$('<%=lbl_valslider.ClientID%>').change(function () { slider.value = parseInt(this.value) });
</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>

4
Customers/Invoices.aspx
View File

@@ -249,6 +249,10 @@
</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>
</asp:Content>

6
Customers/LKWs.aspx
View File

@@ -339,11 +339,11 @@
let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder_M.ClientID%>');
let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>');
alert(id)
let table = document.getElementById('<%=tbl_mainpage_M.ClientID%>');
var rowCount = table.rows.length;
let table_M = document.getElementById('<%=tbl_mainpage_M.ClientID%>');
var rowCount = table_M.rows.length;
for (let i = rowCount - 1; i > 0; i--) {
table.deleteRow(i);
table_M.deleteRow(i);
}
Speditionslabel.textContent = id.split(',')[0];
natplaceholder.textContent = id.split(',')[1];

4
Customers/LKWs.aspx.vb
View File

@@ -399,7 +399,7 @@ Partial Class LKWS
End Sub
<WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json)>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Sub filltable2(Kennzeichen As String)
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)
@@ -423,7 +423,7 @@ Partial Class LKWS
Next
End Sub
<WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json)>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
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 Tbl As New Table

5
Customers/Welcome.aspx
View File

@@ -11,7 +11,10 @@
<link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
<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 -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>

8
login/Change_PW.aspx
View File

@@ -14,9 +14,7 @@
<!-- 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 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"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -400,5 +398,9 @@
</form>
</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>
</html>

9
login/CreateUser.aspx
View File

@@ -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 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"/>
<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"/>
<title>VERAG Spedition AG Login</title>
<link rel="stylesheet" type="text/css" href="../css/main.css"/>

2
login/Logout.aspx
View File

@@ -21,7 +21,7 @@
<form id="form1" runat="server">
<div>
<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>
</form>

17
login/Logout.aspx.vb
View File

@@ -1,11 +1,12 @@

Imports System.Web.Configuration
Imports System.Security.Cryptography
Partial Class login_Logout
Inherits System.Web.UI.Page
Dim sessionname
Sub Page_Load() Handles Me.Load
Function Page_Load() As Threading.Tasks.Task Handles Me.Load
FormsAuthentication.SignOut()
Session.Clear()
Session.Abandon()
@@ -21,14 +22,10 @@ Partial Class login_Logout
'cookie2.Expires = DateTime.Now.AddYears(-1)
'Response.Cookies.Add(cookie2)
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")
End Sub
Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs)
Response.Redirect("../login/login_FLEX.aspx")
End Sub
End Class

2
login/login_FLEX.aspx.vb
View File

@@ -19,7 +19,7 @@ Partial Class login_FLEX
Else
Try
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)))
If String.Equals(teststr, String.Empty) = False Then
intzahliterats = VERAG_VARIABLES.getiterationnumber