Serverseitiges Ändern wurde angefangen implementiert zu werden.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
Imports System.Data.SqlClient
|
Imports System.Data.SqlClient
|
||||||
Imports System.Diagnostics
|
Imports System.Diagnostics
|
||||||
Imports Microsoft.VisualBasic
|
Imports Microsoft.VisualBasic
|
||||||
|
Imports Konscious.Security.Cryptography
|
||||||
|
|
||||||
|
|
||||||
Public Class TestPerformance
|
Public Class TestPerformance
|
||||||
@@ -130,7 +131,7 @@ Public Class TestPerformance
|
|||||||
sw1.Start()
|
sw1.Start()
|
||||||
arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, zahlint)))
|
arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, zahlint)))
|
||||||
arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
|
arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
|
||||||
arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 10), Math.Pow(2, 14))))
|
arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 6), Math.Pow(2, 10))))
|
||||||
sw1.Stop()
|
sw1.Stop()
|
||||||
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
||||||
sw1.Reset()
|
sw1.Reset()
|
||||||
|
|||||||
@@ -29,26 +29,29 @@ Public Class VERAG_VARIABLES
|
|||||||
End Function
|
End Function
|
||||||
Public Shared Async Function HashPassword(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Threading.Tasks.Task(Of Byte())
|
Public Shared Async Function HashPassword(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Threading.Tasks.Task(Of Byte())
|
||||||
'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password))
|
'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password))
|
||||||
|
|
||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
|
Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
|
||||||
Argon.Salt = salt
|
Argon.Salt = salt
|
||||||
Argon.DegreeOfParallelism = 24
|
Argon.DegreeOfParallelism = 24
|
||||||
Argon.Iterations = nIterations
|
Argon.Iterations = nIterations
|
||||||
Argon.MemorySize = (((nIterations * 1 - nIterations / 4 * 2) / 1.05) + 1 * 150)
|
Argon.MemorySize = (((nIterations * 1 - nIterations / 4 * 2) / 1.05) + 1 * 150)
|
||||||
Return Await Argon.GetBytesAsync(nHash)
|
|
||||||
'Return Convert.ToBase64String(Argon.GetBytes(nHash))
|
'Return Convert.ToBase64String(Argon.GetBytes(nHash))
|
||||||
'Return Argon.GetBytes(nHash)
|
'Return Argon.GetBytes(nHash)
|
||||||
'Dim saltBytes = Convert.FromBase64String(salt)
|
'Dim saltBytes = Convert.FromBase64String(salt)
|
||||||
'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations)
|
'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations)
|
||||||
'End Using
|
'End Using
|
||||||
|
Return Await Argon.GetBytesAsync(nHash)
|
||||||
Else
|
Else
|
||||||
Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
|
Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
|
||||||
Argon.Salt = salt
|
Argon.Salt = salt
|
||||||
Argon.DegreeOfParallelism = 48
|
Argon.DegreeOfParallelism = 36
|
||||||
Argon.Iterations = nIterations
|
Argon.Iterations = nIterations
|
||||||
Argon.MemorySize = ((((nIterations * 3 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
|
Argon.MemorySize = ((((nIterations * 4 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
|
||||||
Return Await Argon.GetBytesAsync(nHash)
|
Return Await Argon.GetBytesAsync(nHash)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Public Shared Async Function Verifyhash(ByVal passw As String, ByVal salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Threading.Tasks.Task(Of Boolean)
|
Public Shared Async Function Verifyhash(ByVal passw As String, ByVal salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Threading.Tasks.Task(Of Boolean)
|
||||||
|
|||||||
@@ -150,4 +150,21 @@ Public Class WebService
|
|||||||
|
|
||||||
myConn.Close() : Return lstCountries
|
myConn.Close() : Return lstCountries
|
||||||
End Function
|
End Function
|
||||||
|
<WebMethod()>
|
||||||
|
Private Function buildtablerow(page As Page, tbl As Table) As Table
|
||||||
|
|
||||||
|
Dim row As TableRow = New TableRow
|
||||||
|
Dim c1 As TableCell = New TableCell
|
||||||
|
Dim c2 As TableCell = New TableCell
|
||||||
|
Dim c3 As TableCell = New TableCell
|
||||||
|
|
||||||
|
c1.Text = "ID"
|
||||||
|
c2.Text = "Stadt"
|
||||||
|
c3.Text = "Persona"
|
||||||
|
row.Cells.Add(c1)
|
||||||
|
row.Cells.Add(c2)
|
||||||
|
row.Cells.Add(c3)
|
||||||
|
tbl.Rows.Add(row)
|
||||||
|
Return tbl
|
||||||
|
End Function
|
||||||
End Class
|
End Class
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" %>
|
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" Async="true" %>
|
||||||
|
|
||||||
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server"><%If String.Equals(Page.User.Identity.Name, "Admin") = False Then
|
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server"><%If String.Equals(Page.User.Identity.Name, "Admin") = False Then
|
||||||
FormsAuthentication.RedirectToLoginPage()
|
FormsAuthentication.RedirectToLoginPage()
|
||||||
@@ -79,6 +79,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<tr><td><asp:Button ID="Button1" runat="server" Text="Button" OnClick="Button1_Click" /></td></tr>
|
<tr><td><asp:Button ID="Button1" runat="server" Text="Button" OnClick="Button1_Click" /></td></tr>
|
||||||
|
<tr><td><asp:Button ID="btn_TesthashrateServer" runat="server" Font-Overline="false" BorderStyle="Dashed" ClientIDMode="AutoID" OnClick="btn_TesthashrateServer_ClickAsync" Text="Test hashrate of Server!" /></td></tr>
|
||||||
</table>
|
</table>
|
||||||
</ContentTemplate>
|
</ContentTemplate>
|
||||||
</asp:UpdatePanel>
|
</asp:UpdatePanel>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
|
Imports Konscious.Security.Cryptography
|
||||||
Partial Class Customers_Default2
|
Partial Class Customers_Default2
|
||||||
Inherits System.Web.UI.Page
|
Inherits System.Web.UI.Page
|
||||||
Protected Sub Page_Load(ByVal sender As Object, e As EventArgs) Handles Me.Load
|
Protected Sub Page_Load(ByVal sender As Object, e As EventArgs) Handles Me.Load
|
||||||
@@ -33,4 +33,9 @@ Partial Class Customers_Default2
|
|||||||
txt_Fehlercodezuzahl.Text = finalstr
|
txt_Fehlercodezuzahl.Text = finalstr
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Protected Async Sub btn_TesthashrateServer_ClickAsync(sender As Object, e As EventArgs) Handles btn_TesthashrateServer.Click
|
||||||
|
Dim zahl As Integer = VERAG_VARIABLES.RandomInteger(5, Math.Pow(2, 5))
|
||||||
|
Dim pwhashresult As Byte() = Await TestPerformance.TestHashrateServer(zahl)
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
||||||
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
|
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
|
||||||
<asp:ScriptManager ID="script5" runat="server"></asp:ScriptManager>
|
<asp:ScriptManager ID="script5" runat="server" EnablePageMethods="true"></asp:ScriptManager>
|
||||||
<asp:UpdatePanel ID="panelupdate5" runat="server"><ContentTemplate>
|
<asp:UpdatePanel ID="panelupdate5" runat="server"><ContentTemplate>
|
||||||
<div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
|
<div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
|
||||||
<div id="containerseiterand">
|
<div id="containerseiterand">
|
||||||
@@ -138,78 +138,25 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<asp:Button ID="Button_hid" runat="server" OnClick="TableRowClick" Style="display: none" />
|
|
||||||
</ContentTemplate></asp:UpdatePanel>
|
</ContentTemplate></asp:UpdatePanel>
|
||||||
<!-- jQuery CDN - Slim version (=without AJAX) -->
|
<!-- jQuery CDN - Slim version (=without AJAX) -->
|
||||||
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
||||||
<!-- Popper.JS -->
|
<!-- 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>
|
<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>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function TableRowClick(listtemp, Kennzeichen, Nat) {
|
function TableRow_Click(Nat,Kennzeichen) {
|
||||||
let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
|
let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
|
||||||
let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")
|
let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")
|
||||||
|
|
||||||
Speditionslabel.textContent = Kennzeichen
|
Speditionslabel.textContent = Kennzeichen
|
||||||
natplaceholder.textContent = Nat
|
natplaceholder.textContent = Nat
|
||||||
|
|
||||||
var tb = document.getElementById("<%=tbl_mainpage.ClientID%>");
|
|
||||||
while (tb.rows.length > 1) {
|
|
||||||
tb.deleteRow(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
//debugger
|
|
||||||
//alert(Arr)
|
|
||||||
for (let outertabl of Array.from(listtemp.split("-"))) {
|
|
||||||
for (let arrint of Array.from(outertabl.split(";"))) {
|
|
||||||
for (let innertable = 0; innertable < arrint.length; innertable++) {
|
|
||||||
let SDLNr = arrint[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let Bez = arrint[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let Gueltigbis = arrint[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let KartenNr = arrint[innertable].toString;
|
|
||||||
//alert(SDLNr)
|
|
||||||
//alert(Bez)
|
|
||||||
//alert(Gueltigbis)
|
|
||||||
//alert(KartenNr)
|
|
||||||
addRow(<%=tbl_mainpage.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
function TableRowClick_M(listtemp_M, Kennzeichen, Nat) {
|
function TableRow_Click_M(Nat,Kennzeichen) {
|
||||||
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%>")
|
||||||
|
|
||||||
Speditionslabel.textContent = Kennzeichen
|
Speditionslabel.textContent = Kennzeichen
|
||||||
natplaceholder.textContent = Nat
|
natplaceholder.textContent = Nat
|
||||||
|
|
||||||
var tb = document.getElementById("<%=tbl_mainpage_M.ClientID%>");
|
|
||||||
while (tb.rows.length > 1) {
|
|
||||||
tb.deleteRow(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//debugger
|
|
||||||
//alert(Arr)
|
|
||||||
for (let outertable_M of Array.from(listtemp_M.split("-"))) {
|
|
||||||
for (let arrint_M of Array.from(outertable_M.split(";")))
|
|
||||||
for (let innertable = 0; innertable < arrint_M.length; innertable++) {
|
|
||||||
let SDLNr = arrint_M[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let Bez = arrint_M[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let Gueltigbis = arrint_M[innertable].toString;
|
|
||||||
innertable++;
|
|
||||||
let KartenNr = arrint_M[innertable].toString;
|
|
||||||
//alert(SDLNr)
|
|
||||||
//alert(Bez)
|
|
||||||
//alert(Gueltigbis)
|
|
||||||
//alert(KartenNr)
|
|
||||||
addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
function addRow(table1,par1,par2,par3,par4) {
|
function addRow(table1,par1,par2,par3,par4) {
|
||||||
let tableRef = table1;
|
let tableRef = table1;
|
||||||
|
|||||||
@@ -9,6 +9,20 @@ Partial Class LKWS
|
|||||||
Dim Kdnrtext As String = String.Empty
|
Dim Kdnrtext As String = String.Empty
|
||||||
Dim list As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
|
Dim list As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
|
||||||
Dim list_M As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
|
Dim list_M As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
|
||||||
|
Dim tbl2mainpagetemp As Table
|
||||||
|
Dim TableRows As List(Of TableRow) = New List(Of TableRow)
|
||||||
|
Dim TableRows_M As List(Of TableRow) = New List(Of TableRow)
|
||||||
|
Protected Sub Page_OnInit(sender As Object, e As EventArgs)
|
||||||
|
If TableRows.Count = 0 Then
|
||||||
|
For Each tr In TableRows
|
||||||
|
tbl_mainpage_M.Rows.Add(tr)
|
||||||
|
Next
|
||||||
|
Else
|
||||||
|
For Each tr In TableRows
|
||||||
|
tbl_mainpage.Rows.Add(tr)
|
||||||
|
Next
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
|
Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
|
||||||
VERAG_VARIABLES.initerrorcount()
|
VERAG_VARIABLES.initerrorcount()
|
||||||
|
|
||||||
@@ -57,7 +71,6 @@ Partial Class LKWS
|
|||||||
Dim tc_KZ_Ab As TableCell = New TableCell()
|
Dim tc_KZ_Ab As TableCell = New TableCell()
|
||||||
Dim tc_Vermerk As TableCell = New TableCell()
|
Dim tc_Vermerk As TableCell = New TableCell()
|
||||||
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen)
|
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen)
|
||||||
Dim list3 As List(Of String) = New List(Of String)
|
|
||||||
|
|
||||||
tc_KfzKennz.Text = l1.KfzKennzeichen
|
tc_KfzKennz.Text = l1.KfzKennzeichen
|
||||||
tr1.Cells.Add(tc_KfzKennz)
|
tr1.Cells.Add(tc_KfzKennz)
|
||||||
@@ -100,6 +113,7 @@ Partial Class LKWS
|
|||||||
Dim strtemparr As String = String.Empty
|
Dim strtemparr As String = String.Empty
|
||||||
Dim strtemp2 As String = String.Empty
|
Dim strtemp2 As String = String.Empty
|
||||||
Dim strarrtemp = String.Empty
|
Dim strarrtemp = String.Empty
|
||||||
|
tbl2mainpagetemp = New Table
|
||||||
For Each l2 In list2
|
For Each l2 In list2
|
||||||
Dim String2 As String = String.Empty
|
Dim String2 As String = String.Empty
|
||||||
|
|
||||||
@@ -108,8 +122,21 @@ Partial Class LKWS
|
|||||||
Else
|
Else
|
||||||
Stringtemp = String.Empty
|
Stringtemp = String.Empty
|
||||||
End If
|
End If
|
||||||
|
Dim tr As TableRow = New TableRow
|
||||||
list3.Add(l2.SDLNr.ToString + ";" + Stringtemp + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString)
|
Dim tc_SDL As TableCell = New TableCell
|
||||||
|
Dim tc_Bez As TableCell = New TableCell
|
||||||
|
Dim tc_gueltigbis As TableCell = New TableCell
|
||||||
|
Dim tc_Karten_Nr As TableCell = New TableCell
|
||||||
|
tc_SDL.Text = l2.SDLNr.ToString
|
||||||
|
tc_Bez.Text = Stringtemp
|
||||||
|
tc_gueltigbis.Text = l2.GültigBis.ToString
|
||||||
|
tc_Karten_Nr.Text = l2.KartenNr.ToString
|
||||||
|
tr.Cells.Add(tc_SDL)
|
||||||
|
tr.Cells.Add(tc_Bez)
|
||||||
|
tr.Cells.Add(tc_gueltigbis)
|
||||||
|
tr.Cells.Add(tc_Karten_Nr)
|
||||||
|
TableRows.Add(tr)
|
||||||
|
'MsgBox(TableRows.Count.ToString)
|
||||||
Next
|
Next
|
||||||
If String.IsNullOrEmpty(l1.Nationalität) = True Then
|
If String.IsNullOrEmpty(l1.Nationalität) = True Then
|
||||||
strtemp2 = "Keine Angabe"
|
strtemp2 = "Keine Angabe"
|
||||||
@@ -117,10 +144,7 @@ Partial Class LKWS
|
|||||||
strtemp2 = l1.Nationalität
|
strtemp2 = l1.Nationalität
|
||||||
End If
|
End If
|
||||||
|
|
||||||
For Each l4 In list3
|
tr1.Attributes.Add("onclick", "Javascript:TableRow_Click(""" & strtemp2 & """,""" & l1.KfzKennzeichen & """)")
|
||||||
strarrtemp = String.Join("-", l4.ToString)
|
|
||||||
Next
|
|
||||||
tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & strarrtemp & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
|
|
||||||
cnt += 1
|
cnt += 1
|
||||||
tbl_sidemenue.Rows.Add(tr1)
|
tbl_sidemenue.Rows.Add(tr1)
|
||||||
Next
|
Next
|
||||||
@@ -201,8 +225,7 @@ Partial Class LKWS
|
|||||||
Next
|
Next
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Protected Sub TableRowClick(ByVal sender As TableRow, e As EventArgs)
|
|
||||||
End Sub
|
|
||||||
|
|
||||||
Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs)
|
Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs)
|
||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
@@ -261,9 +284,7 @@ Partial Class LKWS
|
|||||||
cnt += 1
|
cnt += 1
|
||||||
Next
|
Next
|
||||||
End Sub
|
End Sub
|
||||||
Protected Sub Button_hid_Click(sender As Object, e As EventArgs)
|
|
||||||
'MsgBox("Test erfolgreich!")
|
|
||||||
End Sub
|
|
||||||
Protected Sub btn_alle_M_Click(sender As Object, e As EventArgs)
|
Protected Sub btn_alle_M_Click(sender As Object, e As EventArgs)
|
||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||||
@@ -348,9 +369,10 @@ Partial Class LKWS
|
|||||||
For Each Ltenp In list2
|
For Each Ltenp In list2
|
||||||
str2temptemp = String.Join("-", Ltenp)
|
str2temptemp = String.Join("-", Ltenp)
|
||||||
Next
|
Next
|
||||||
tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
|
tr1_M.Attributes.Add("OnClick", "Javascript:TableRow_Click_M(""" & strtemp2 & """,""" & l3.KfzKennzeichen & """)")
|
||||||
tbl_2.Rows.Add(tr1_M)
|
tbl_2.Rows.Add(tr1_M)
|
||||||
cnt += 1
|
cnt += 1
|
||||||
Next
|
Next
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
166
Web.config
166
Web.config
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!--
|
<!--
|
||||||
Weitere Informationen zum Konfigurieren der ASP.NET-Anwendung finden Sie unter
|
Weitere Informationen zum Konfigurieren der ASP.NET-Anwendung finden Sie unter
|
||||||
http://go.microsoft.com/fwlink/?LinkId=169433
|
http://go.microsoft.com/fwlink/?LinkId=169433
|
||||||
@@ -26,23 +26,23 @@
|
|||||||
<system.web>
|
<system.web>
|
||||||
<webServices>
|
<webServices>
|
||||||
<protocols>
|
<protocols>
|
||||||
<add name="HttpGet"/>
|
<add name="HttpGet" />
|
||||||
<add name="HttpPost"/>
|
<add name="HttpPost" />
|
||||||
</protocols>
|
</protocols>
|
||||||
<conformanceWarnings>
|
<conformanceWarnings>
|
||||||
<remove name="BasicProfile1_1"/>
|
<remove name="BasicProfile1_1" />
|
||||||
</conformanceWarnings>
|
</conformanceWarnings>
|
||||||
</webServices>
|
</webServices>
|
||||||
<authentication mode="Forms">
|
<authentication mode="Forms">
|
||||||
<forms defaultUrl="/Customers/Welcome.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880"/>
|
<forms defaultUrl="/Customers/Welcome.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880" />
|
||||||
</authentication>
|
</authentication>
|
||||||
<sessionState mode="InProc" timeout="2880" cookieless="false" regenerateExpiredSessionId="false" compressionEnabled="false" useHostingIdentity="true"/>
|
<sessionState mode="InProc" timeout="2880" cookieless="false" regenerateExpiredSessionId="false" compressionEnabled="false" useHostingIdentity="true" />
|
||||||
<httpRuntime requestValidationMode="2.0" targetFramework="4.7"/>
|
<httpRuntime requestValidationMode="2.0" targetFramework="4.7" />
|
||||||
<pages validateRequest="false" controlRenderingCompatibilityVersion="4.0"/>
|
<pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" />
|
||||||
<!--<securityPolicy>
|
<!--<securityPolicy>
|
||||||
<trustLevel name="Full" policyFile="internal"/>
|
<trustLevel name="Full" policyFile="internal"/>
|
||||||
</securityPolicy>-->
|
</securityPolicy>-->
|
||||||
<customErrors mode="Off"/>
|
<customErrors mode="Off" />
|
||||||
<compilation strict="false" explicit="true" targetFramework="4.7.1" debug="true">
|
<compilation strict="false" explicit="true" targetFramework="4.7.1" debug="true">
|
||||||
<!-- <assemblies>
|
<!-- <assemblies>
|
||||||
<add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/>
|
<add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/>
|
||||||
@@ -58,56 +58,60 @@
|
|||||||
<add assembly="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
|
<add assembly="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
|
||||||
<add assembly="MySql.Data.Entity, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
|
<add assembly="MySql.Data.Entity, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
|
||||||
<add assembly="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30AD4FE6B2A6AEED" /> -->
|
<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.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.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
|
<add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
<add assembly="System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
|
<add assembly="System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
|
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
<add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
<add assembly="System.Transactions, 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.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.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.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.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
<add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
<add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||||
<add assembly="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
<add assembly="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||||
|
<add assembly="System.Diagnostics.Tracing, Version=4.1.2.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
|
<add assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
|
<add assembly="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
|
<add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
</assemblies>
|
</assemblies>
|
||||||
</compilation>
|
</compilation>
|
||||||
<membership defaultProvider="MySqlMembershipProvider">
|
<membership defaultProvider="MySqlMembershipProvider">
|
||||||
<providers>
|
<providers>
|
||||||
<clear/>
|
<clear />
|
||||||
<add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d" autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/"/>
|
<add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d" autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/" />
|
||||||
</providers>
|
</providers>
|
||||||
</membership>
|
</membership>
|
||||||
</system.web>
|
</system.web>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="MyProviderDbConn" connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306" providerName="MySqlMembershipProvider"/>
|
<add name="MyProviderDbConn" connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306" providerName="MySqlMembershipProvider" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString" connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString" connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString" connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString" connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
|
||||||
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" providerName=""/>
|
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" providerName="" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<rewrite>
|
<rewrite>
|
||||||
<rules>
|
<rules>
|
||||||
<rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true">
|
<rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true">
|
||||||
<match url="(.*)"/>
|
<match url="(.*)" />
|
||||||
<conditions>
|
<conditions>
|
||||||
<add input="{HTTPS}" pattern="off"/>
|
<add input="{HTTPS}" pattern="off" />
|
||||||
</conditions>
|
</conditions>
|
||||||
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}"/>
|
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}" />
|
||||||
</rule>
|
</rule>
|
||||||
</rules>
|
</rules>
|
||||||
</rewrite>
|
</rewrite>
|
||||||
@@ -115,72 +119,76 @@
|
|||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral"/>
|
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046"/>
|
<bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral"/>
|
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
<assemblyIdentity name="Microsoft.CodeAnalysis.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="KellermanSoftware.Compare-NET-Objects" publicKeyToken="d970ace04cc85217" culture="neutral"/>
|
<assemblyIdentity name="KellermanSoftware.Compare-NET-Objects" publicKeyToken="d970ace04cc85217" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.74.0.0" newVersion="4.74.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.74.0.0" newVersion="4.74.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Serilog.Sinks.Console" publicKeyToken="24c2f752a8e58a10" culture="neutral"/>
|
<assemblyIdentity name="Serilog.Sinks.Console" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None"/>
|
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
|
||||||
<add key="ClientValidationEnabled" value="true"/>
|
<add key="ClientValidationEnabled" value="true" />
|
||||||
<add key="UnobtrusiveJavaScriptEnabled" value="false"/>
|
<add key="UnobtrusiveJavaScriptEnabled" value="false" />
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<location path="Customers">
|
<location path="Customers">
|
||||||
<system.web>
|
<system.web>
|
||||||
<authorization>
|
<authorization>
|
||||||
<allow users="?"/>
|
<allow users="?" />
|
||||||
<!--A question mark (?) denies anonymous users-->
|
<!--A question mark (?) denies anonymous users-->
|
||||||
</authorization>
|
</authorization>
|
||||||
</system.web>
|
</system.web>
|
||||||
@@ -188,14 +196,14 @@
|
|||||||
<location path="admin">
|
<location path="admin">
|
||||||
<system.web>
|
<system.web>
|
||||||
<authorization>
|
<authorization>
|
||||||
<allow users="Admin,admin"/>
|
<allow users="Admin,admin" />
|
||||||
</authorization>
|
</authorization>
|
||||||
</system.web>
|
</system.web>
|
||||||
</location>
|
</location>
|
||||||
<system.codedom>
|
<system.codedom>
|
||||||
<compilers>
|
<compilers>
|
||||||
<compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
|
<compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||||
<compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\"Web\" /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
|
<compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\"Web\" /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||||
</compilers>
|
</compilers>
|
||||||
</system.codedom>
|
</system.codedom>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -10,8 +10,8 @@
|
|||||||
<package id="K4os.Compression.LZ4" version="1.2.16" targetFramework="net471" />
|
<package id="K4os.Compression.LZ4" version="1.2.16" targetFramework="net471" />
|
||||||
<package id="K4os.Compression.LZ4.Streams" version="1.2.16" targetFramework="net471" />
|
<package id="K4os.Compression.LZ4.Streams" version="1.2.16" targetFramework="net471" />
|
||||||
<package id="K4os.Hash.xxHash" version="1.0.7" targetFramework="net471" />
|
<package id="K4os.Hash.xxHash" version="1.0.7" targetFramework="net471" />
|
||||||
<package id="Konscious.Security.Cryptography.Argon2" version="1.2.1" targetFramework="net47" />
|
<package id="Konscious.Security.Cryptography.Argon2" version="1.2.0" targetFramework="net471" />
|
||||||
<package id="Konscious.Security.Cryptography.Blake2" version="1.0.9" targetFramework="net47" />
|
<package id="Konscious.Security.Cryptography.Blake2" version="1.0.8" targetFramework="net471" />
|
||||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net471" />
|
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net471" />
|
||||||
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net471" developmentDependency="true" />
|
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net471" developmentDependency="true" />
|
||||||
<package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net471" />
|
<package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net471" />
|
||||||
@@ -22,25 +22,71 @@
|
|||||||
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net471" />
|
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net471" />
|
||||||
<package id="Microsoft.CST.DevSkim" version="0.6.5" targetFramework="net471" />
|
<package id="Microsoft.CST.DevSkim" version="0.6.5" targetFramework="net471" />
|
||||||
<package id="Microsoft.CST.OAT" version="1.1.15" targetFramework="net471" />
|
<package id="Microsoft.CST.OAT" version="1.1.15" targetFramework="net471" />
|
||||||
|
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net471" />
|
||||||
|
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="MySql.Data" version="8.0.27" targetFramework="net47" />
|
<package id="MySql.Data" version="8.0.27" targetFramework="net47" />
|
||||||
|
<package id="NETStandard.Library" version="1.6.1" targetFramework="net471" />
|
||||||
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
|
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
|
||||||
<package id="Serilog" version="2.10.0" targetFramework="net47" />
|
<package id="Serilog" version="2.10.0" targetFramework="net47" />
|
||||||
<package id="Serilog.Sinks.Console" version="4.0.1" targetFramework="net471" />
|
<package id="Serilog.Sinks.Console" version="4.0.1" targetFramework="net471" />
|
||||||
|
<package id="System.AppContext" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
|
||||||
<package id="System.Collections" version="4.3.0" targetFramework="net47" />
|
<package id="System.Collections" version="4.3.0" targetFramework="net47" />
|
||||||
|
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Collections.Immutable" version="6.0.0" targetFramework="net471" />
|
<package id="System.Collections.Immutable" version="6.0.0" targetFramework="net471" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net471" />
|
<package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Console" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Drawing.Common" version="6.0.0" targetFramework="net471" />
|
<package id="System.Drawing.Common" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Globalization" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO.Compression" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.IO.UnmanagedMemoryStream" version="4.0.1" targetFramework="net471" />
|
||||||
|
<package id="System.Linq" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Memory" version="4.5.4" targetFramework="net47" />
|
<package id="System.Memory" version="4.5.4" targetFramework="net47" />
|
||||||
|
<package id="System.Net.Http" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
|
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
|
||||||
|
<package id="System.ObjectModel" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Reflection" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Reflection.Metadata" version="6.0.0" targetFramework="net471" />
|
<package id="System.Reflection.Metadata" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
|
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net471" />
|
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Security.Permissions" version="6.0.0" targetFramework="net471" />
|
<package id="System.Security.Permissions" version="6.0.0" targetFramework="net471" />
|
||||||
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net47" />
|
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net47" />
|
||||||
|
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net471" />
|
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net471" />
|
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net471" />
|
||||||
<package id="System.Text.Json" version="6.0.0" targetFramework="net471" />
|
<package id="System.Text.Json" version="6.0.0" targetFramework="net471" />
|
||||||
|
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Threading" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
|
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
|
||||||
|
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net471" />
|
||||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
|
<package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
|
||||||
|
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net471" />
|
||||||
|
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net471" />
|
||||||
</packages>
|
</packages>
|
||||||
Reference in New Issue
Block a user