Revert "Änderungen zurück bei formen"

This reverts commit 5abe52b2b9.
This commit is contained in:
ja
2022-02-07 08:53:21 +01:00
parent 5abe52b2b9
commit 3097539f1d
17 changed files with 276 additions and 164 deletions

View File

@@ -22,9 +22,9 @@ Public Class VERAG_VARIABLES
End Function End Function
Shared Function getiterationnumber() As Integer Shared Function getiterationnumber() As Integer
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then 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 Else
Return RandomInteger(Math.Pow(2, 3), (0.57 * GetMaxCpuSpeed())) Return RandomInteger(Math.Pow(2, 5), (0.34 * GetCpuSpeed()))
End If End If
End Function End Function
@@ -55,7 +55,7 @@ Public Class VERAG_VARIABLES
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt Argon.Salt = salt
Argon.DegreeOfParallelism = 28 Argon.DegreeOfParallelism = 8
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
Return Argon.GetBytes(nHash) Return Argon.GetBytes(nHash)

View File

@@ -151,19 +151,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,param2) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNumber; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -131,19 +131,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,param2); var param5 = getParamValue('SDLNr');
alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNumber; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -135,13 +135,9 @@
function detailtabelle(id, CardNo) { function detailtabelle(id, CardNo) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['Kundennr'] = CustomerID; data['CardNo'] = CardNo;
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
data['History'] = History;
$.ajax({ $.ajax({
type: "POST", type: "POST",

View File

@@ -105,19 +105,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,param2) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id, CardNo) {
// alert("Testdata:" + id)
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['Kennzeichen'] = id;
data['CardNo'] = CardNo; data['Kundennr'] = CustomerID;
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
data['History'] = History;
$.ajax({ $.ajax({
type: "POST", type: "POST",

View File

@@ -151,19 +151,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1, CardNumber) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id, CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; 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({ $.ajax({
type: "POST", type: "POST",
url: "Formtemplate MultiBox_EcoTAX.aspx/filltabledetails", url: "Formtemplate MultiBox_EcoTAX.aspx/filltabledetails",

View File

@@ -142,19 +142,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1, param2) var param5 = getParamValue('SDLNr');
// alert(param1) var param6 = getParamValue('History');
function detailtabelle(id, CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNumber; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -154,19 +154,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('Kennzeichen'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNumber; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -143,20 +143,29 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNr'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
var param4 = getParamValue('CustomerNo');
var param5 = getParamValue('SDLNr');
var param6 = getParamValue('History');
$('txt_ClientNr').val(param1); $('txt_ClientNr').val(param1);
detailtabelle(param1,param2) detailtabelle(param1, param2, param3, param4, param5, param6);
alert(param2) //alert(param1)
function detailtabelle(id,cardnumber) {
// alert("Testdata:" + id)
let data = {}; function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) {
data['Kennzeichen'] = id; // alert("Testdata:" + 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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -148,19 +148,28 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNr'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
var param4 = getParamValue('CustomerNo');
var param5 = getParamValue('SDLNr');
var param6 = getParamValue('History');
$('txt_ClientNr').val(param1); $('txt_ClientNr').val(param1);
detailtabelle(param1) detailtabelle(param1, param2, param3, param4, param5, param6);
//alert(param1) //alert(param1)
function detailtabelle(id, CardNumber) { function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['CardNo'] = CardNumber; data['Kundennr'] = CustomerID;
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
data['History'] = History;
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "Formtemplate IT_Plose.aspx/filltabledetails", url: "Formtemplate IT_Plose.aspx/filltabledetails",

View File

@@ -149,18 +149,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
var param4 = getParamValue('CustomerNo');
var param5 = getParamValue('SDLNr');
var param6 = getParamValue('History');
$('txt_ClientNr').val(param1); $('txt_ClientNr').val(param1);
detailtabelle(param1,param2) detailtabelle(param1, param2, param3, param4, param5, param6);
//alert(param1) //alert(param1)
function detailtabelle(id, Cardnumber) { function detailtabelle(param1, param2, param3, param4, param5, param6) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['Kundennr'] = CustomerID;
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
data['History'] = History;
$.ajax({ $.ajax({
type: "POST", type: "POST",

View File

@@ -132,19 +132,28 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
var param4 = getParamValue('CustomerNo');
var param5 = getParamValue('SDLNr');
var param6 = getParamValue('History');
$('txt_ClientNr').val(param1); $('txt_ClientNr').val(param1);
detailtabelle(param1,param2) detailtabelle(param1, param2, param3, param4, param5, param6);
alert(param1) //alert(param1)
function detailtabelle(id, Cardnummer) { function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['CardNo'] = Cardnummer; data['Kundennr'] = CustomerID;
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
data['History'] = History;
$.ajax({ $.ajax({
type: "POST", type: "POST",

View File

@@ -136,19 +136,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,param2) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,CardNumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNumber; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -140,19 +140,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1, param2); var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id, CardNo) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = CardNo; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -144,19 +144,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,param2) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,cardno) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = cardno; //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({ $.ajax({
type: "POST", type: "POST",

View File

@@ -157,19 +157,27 @@
return pArr[1]; //return value return pArr[1]; //return value
} }
} }
var param1 = getParamValue('Kennzeichen'); var param1 = getParamValue('Kennzeichen');
var param2 = getParamValue('CardNo'); var param2 = getParamValue('CustomerID');
var param3 = getParamValue('CardNo');
$('txt_ClientNr').val(param1); var param4 = getParamValue('CustomerNo');
detailtabelle(param1,Cardnummer) var param5 = getParamValue('SDLNr');
//alert(param1) var param6 = getParamValue('History');
function detailtabelle(id,Cardnumber) {
// alert("Testdata:" + id)
let data = {}; $('txt_ClientNr').val(param1);
data['Kennzeichen'] = id; detailtabelle(param1, param2, param3, param4, param5, param6);
data['CardNo'] = Cardnumber; //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({ $.ajax({
type: "POST", type: "POST",
url: "Formtemplate_MAUT_AT GoBox.aspx/filltabledetails", url: "Formtemplate_MAUT_AT GoBox.aspx/filltabledetails",

View File

@@ -22,11 +22,11 @@ Partial Class login_FLEX
Try Try
Dim teststr = String.Empty Dim teststr = String.Empty
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17))
teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed())
Else Else
intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17))
teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed())
End If End If
If String.Equals(teststr, String.Empty) = False Then If String.Equals(teststr, String.Empty) = False Then
intzahliterats = VERAG_VARIABLES.getiterationnumber intzahliterats = VERAG_VARIABLES.getiterationnumber
@@ -217,7 +217,7 @@ Partial Class login_FLEX
End If End If
If String.Equals(tb3.Text, dr("Password")) = True Then 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) salt = VERAG_VARIABLES.GenerateSalt(intzahl)
Dim hashpw As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(passw, salt, intzahliterats, 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 If Await VERAG_VARIABLES.VerifyhashAsync(dr("Password").ToString, salt, hashpw, intzahliterats, intzahl) = True Then