diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 8f344e4..6dc1b2f 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -22,9 +22,9 @@ Public Class VERAG_VARIABLES End Function Shared Function getiterationnumber() As Integer If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - Return RandomInteger(Math.Pow(2, 2), (0.55 * GetCpuSpeed())) + Return RandomInteger(Math.Pow(2, 2), (0.35 * GetCpuSpeed())) Else - Return RandomInteger(Math.Pow(2, 3), (0.57 * GetMaxCpuSpeed())) + Return RandomInteger(Math.Pow(2, 5), (0.34 * GetCpuSpeed())) End If End Function @@ -55,16 +55,18 @@ Public Class VERAG_VARIABLES If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 28 + Argon.DegreeOfParallelism = 8 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - Argon.MemorySize = (((nIterations * 9.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + 'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Argon.GetBytes(nHash) Else Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 8 - Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 4) - Argon.MemorySize = (((nIterations * 13.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1 + Argon.DegreeOfParallelism = 10 + Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) + 'Argon.MemorySize = (((nIterations * 20.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Argon.GetBytes(nHash) End If End Function @@ -74,16 +76,18 @@ Public Class VERAG_VARIABLES If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 44 + Argon.DegreeOfParallelism = 8 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - Argon.MemorySize = (((nIterations * 15.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + 'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Await Argon.GetBytesAsync(nHash) Else Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 14 + Argon.DegreeOfParallelism = 10 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - Argon.MemorySize = (((nIterations * 13.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1 + 'Argon.MemorySize = (((nIterations * 21.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Await Argon.GetBytesAsync(nHash) End If End Function diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx b/Customers/SDL/Formtemplate EcoTAX.aspx index 7060fbf..5aaf7ca 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx +++ b/Customers/SDL/Formtemplate EcoTAX.aspx @@ -151,19 +151,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - //alert(param1) - - function detailtabelle(id,CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx index 30c83fc..943b30b 100644 --- a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx +++ b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx @@ -131,19 +131,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2); - alert(param1) - - function detailtabelle(id,CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index 2beffe6..abc1635 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -125,39 +125,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - //alert(param1) - - function detailtabelle(id, CardNo) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNo; var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6) - //alert(param1) + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx index 616e714..777106e 100644 --- a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx +++ b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx @@ -105,19 +105,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - //alert(param1) - - function detailtabelle(id, CardNo) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; data['Kennzeichen'] = id; - data['CardNo'] = CardNo; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx index 6a4efef..e5742c5 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx @@ -151,19 +151,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1, CardNumber) - //alert(param1) - - function detailtabelle(id, CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", url: "Formtemplate MultiBox_EcoTAX.aspx/filltabledetails", diff --git a/Customers/SDL/Formtemplate Plose.aspx b/Customers/SDL/Formtemplate Plose.aspx index f08c601..e36050b 100644 --- a/Customers/SDL/Formtemplate Plose.aspx +++ b/Customers/SDL/Formtemplate Plose.aspx @@ -142,19 +142,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2) - // alert(param1) - - function detailtabelle(id, CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate VERAG_Card.aspx b/Customers/SDL/Formtemplate VERAG_Card.aspx index e8e2e65..8f1cd87 100644 --- a/Customers/SDL/Formtemplate VERAG_Card.aspx +++ b/Customers/SDL/Formtemplate VERAG_Card.aspx @@ -154,19 +154,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('Kennzeichen'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1) - //alert(param1) - - function detailtabelle(id,CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx index efb505f..d3c2bb7 100644 --- a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx +++ b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx @@ -143,20 +143,29 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNr'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); + $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - alert(param2) - - function detailtabelle(id,cardnumber) { - // alert("Testdata:" + id) + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = cardnumber; + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx index 33e5d31..83edf0c 100644 --- a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx @@ -148,19 +148,28 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNr'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); $('txt_ClientNr').val(param1); - detailtabelle(param1) - //alert(param1) - - function detailtabelle(id, CardNumber) { + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { // alert("Testdata:" + id) - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; + $.ajax({ type: "POST", url: "Formtemplate IT_Plose.aspx/filltabledetails", diff --git a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx index a0bc704..45e3199 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx @@ -149,18 +149,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) + detailtabelle(param1, param2, param3, param4, param5, param6); //alert(param1) - function detailtabelle(id, Cardnumber) { + function detailtabelle(param1, param2, param3, param4, param5, param6) { // alert("Testdata:" + id) let data = {}; data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx index b10ceac..72b198f 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx @@ -132,19 +132,28 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); + $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - alert(param1) + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) - function detailtabelle(id, Cardnummer) { + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { // alert("Testdata:" + id) - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = Cardnummer; + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx index 5fef328..7c44a9c 100644 --- a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx +++ b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx @@ -136,19 +136,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - //alert(param1) - - function detailtabelle(id,CardNumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx index 232e944..c78de4d 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx @@ -140,19 +140,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2); - //alert(param1) - - function detailtabelle(id, CardNo) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNo; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx index dd7cc37..e73185e 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx @@ -144,19 +144,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) - //alert(param1) - - function detailtabelle(id,cardno) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = cardno; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx index da54fea..c796457 100644 --- a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx +++ b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx @@ -157,19 +157,27 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); - - $('txt_ClientNr').val(param1); - detailtabelle(param1,Cardnummer) - //alert(param1) - - function detailtabelle(id,Cardnumber) { - // alert("Testdata:" + id) + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = Cardnumber; + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6); + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", url: "Formtemplate_MAUT_AT GoBox.aspx/filltabledetails", diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 7a13041..e7d6c1c 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -22,11 +22,11 @@ Partial Class login_FLEX Try Dim teststr = String.Empty If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) - teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) + intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17)) + teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed()) Else - intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) - teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) + intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17)) + teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed()) End If If String.Equals(teststr, String.Empty) = False Then intzahliterats = VERAG_VARIABLES.getiterationnumber @@ -217,7 +217,7 @@ Partial Class login_FLEX End If If String.Equals(tb3.Text, dr("Password")) = True Then - intzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(95, 200), 0.6 * VERAG_VARIABLES.GetCpuSpeed()) + intzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(95, 200), 0.2 * VERAG_VARIABLES.GetCpuSpeed()) salt = VERAG_VARIABLES.GenerateSalt(intzahl) Dim hashpw As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(passw, salt, intzahliterats, intzahl) If Await VERAG_VARIABLES.VerifyhashAsync(dr("Password").ToString, salt, hashpw, intzahliterats, intzahl) = True Then