diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index c61186a..4f3f251 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -51,7 +51,6 @@ Public Class VERAG_VARIABLES
Public Shared Function HashPassword(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Byte()
'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password))
-
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
@@ -72,7 +71,6 @@ Public Class VERAG_VARIABLES
End Function
Public Shared Async Function HashPasswordAsync(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Task(Of Byte())
'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password))
-
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
@@ -89,7 +87,6 @@ Public Class VERAG_VARIABLES
Return Await Argon.GetBytesAsync(nHash)
End If
End Function
-
Public Shared Function Verifyhash(ByVal passw As String, salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Boolean
Dim newHash As Byte() = HashPassword(passw, salt, nIterations, nHash)
Return hash.SequenceEqual(newHash)
@@ -104,6 +101,4 @@ Public Class VERAG_VARIABLES
rand.GetBytes(one_byte)
Return min + (max - min) * (one_byte(0) / 255)
End Function
-
-
End Class
diff --git a/Customers/Default2.aspx.vb b/Customers/Default2.aspx.vb
index 3d51371..35f89c5 100644
--- a/Customers/Default2.aspx.vb
+++ b/Customers/Default2.aspx.vb
@@ -1,12 +1,11 @@
Imports Konscious.Security.Cryptography
Partial Class Customers_Default2
Inherits System.Web.UI.Page
- Dim nIterations As Integer = VERAG_VARIABLES.getiterationnumber
+ Dim nIterations As Integer = VERAG_VARIABLES.getiterationnumber * VERAG_VARIABLES.RandomInteger(2, 3)
Dim MemorySizelocal As Integer = -1
Dim MemorySizeProductionServ As Integer = -1
Dim randzahl As Integer = -1
Protected Sub Page_Load(ByVal sender As Object, e As EventArgs) Handles Me.Load
-
If Page.IsPostBack Then
Page.MaintainScrollPositionOnPostBack = True
If Not HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
@@ -24,16 +23,16 @@ Partial Class Customers_Default2
MemorySizeProductionServ = (((nIterations * VERAG_VARIABLES.RandomInteger(1, 2.5)) * 6.485 - ((nIterations * VERAG_VARIABLES.RandomInteger(1, 2)) * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 516
randzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 0), Math.Pow(2, 2)), Math.Pow(2, 4))
ElseIf Integer.Parse(sld_getbenchmarkheat.Value) > 40 And Integer.Parse(sld_getbenchmarkheat.Value) < 60 Then
- MemorySizelocal = (((nIterations * 1.45) * 4.98 - ((nIterations * 1.15) * 1.23) / 4 * 1.5) / 1.05) + 0.95 * 420
+ MemorySizelocal = (((nIterations * 5.45) * 4.98 - ((nIterations * 1.15) * 1.23) / 4 * 1.5) / 1.05) + 0.95 * 420
MemorySizeProductionServ = (((nIterations * VERAG_VARIABLES.RandomInteger(1, 2.32)) * 7.485 - ((nIterations * VERAG_VARIABLES.RandomInteger(1, 2.32)) * 0.56) / 1.85 * 2.28) / 7.28) + 1.024 * 646
randzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 0), Math.Pow(2, 4)), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 3), Math.Pow(2, 4)))
ElseIf Integer.Parse(sld_getbenchmarkheat.Value) > 60 And Integer.Parse(sld_getbenchmarkheat.Value) < 80 Then
- MemorySizelocal = (((nIterations * 1.85) * 4.98 - ((nIterations * 2) * 1.23) / 4 * 1.5) / 1.05) + 1 * 790
+ MemorySizelocal = (((nIterations * VERAG_VARIABLES.RandomInteger(4.85, 8)) * 4.98 - ((nIterations * 2) * 1.23) / 4 * 1.5) / 1.05) + 1 * 790
MemorySizeProductionServ = (((nIterations * VERAG_VARIABLES.RandomInteger(1, 2.32)) * 8.585 - ((nIterations * VERAG_VARIABLES.RandomInteger(1, 2.32)) * 0.56) / 1.85 * 2.28) / 7.28) + 1.024 * 816
randzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 5)), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 5), Math.Pow(2, 7)))
ElseIf Integer.Parse(sld_getbenchmarkheat.Value) > 80 And Integer.Parse(sld_getbenchmarkheat.Value) < 100 Then
- MemorySizelocal = (((nIterations * 2) * 4.98 - ((nIterations * 2) * 1.23) / 4 * 1.5) / 1.05) + 1 * 290
- MemorySizeProductionServ = (((nIterations * VERAG_VARIABLES.RandomInteger(1, 3)) * 9.485 - ((nIterations * VERAG_VARIABLES.RandomInteger(1, 3)) * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416
+ MemorySizelocal = (((nIterations * Math.Pow(2, 11)) * 14.98 - ((nIterations * 2) * 1.23) / 4 * 1.5) / 1.05) + 1 * 290
+ MemorySizeProductionServ = (((nIterations * * Math.Pow(2, 14)) * 11.485 - ((nIterations * VERAG_VARIABLES.RandomInteger(2, 5)) * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416
randzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 3), Math.Pow(2, 4)), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 5), Math.Pow(2, 7)))
End If
Else
diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index ab12bac..704e147 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -536,7 +536,7 @@ iframe {overflow:hidden}
async:"true",
data: JSON.stringify(data),
success: function (data) {
- alert(data.d.AaData)
+ //alert(data.d.AaData)
result2 = data.d;
// addheader();
var rowCount = table.rows.length;
@@ -569,67 +569,67 @@ iframe {overflow:hidden}
// alert("Var:" + id.split(',')[0]+customerid);
if (result[i]["0"] == 200 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = '';
- strHTML4 = '| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
// } else if (result[i]["0"] == 204 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
// iframe = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
//} else if (result[i]["0"] == 205 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
// iframe = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
//} else if (result[i]["0"] == 206 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
// iframe = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 207 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 208 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 209 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 210 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 211 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 214 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 215 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 216 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 500 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 501 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
}
$('#<%=tablemain.ClientID%>').append(strHTML4);
}
@@ -709,67 +709,67 @@ iframe {overflow:hidden}
if (result[i]["0"] == 200 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] ){
iframe_M = '';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 100 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 101 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 201 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 202 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 203 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
// } else if (result[i]["0"] == 204 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
// iframe_M = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
//} else if (result[i]["0"] == 205 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
// iframe_M = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
//} else if (result[i]["0"] == 206) && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
// iframe_M = ' ';
- // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ // strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 207 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 208 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 209 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 210 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 211 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 212 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 213 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 214 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 215 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 216 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + ifram_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + ifram_M + ' |
'
} else if (result[i]["0"] == 500 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
} else if (result[i]["0"] == 501 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){
iframe_M = ' ';
- strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
+ strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe_M + ' |
'
}
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
}
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
index c75c488..5c8508a 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
@@ -78,7 +78,7 @@ Partial Class Customers_Default3
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
Dim listdetails As New List(Of List(Of String))
For Each l2 In list2
- If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr.ToString = SDLNr Then
+ If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr.ToString = SDLNr And l2.History.ToString = History Then
Dim strtempbestelltam As String = String.Empty
Dim strtempLieferdatum As String = String.Empty
Dim strtempKartenNr As String = String.Empty
@@ -98,7 +98,7 @@ Partial Class Customers_Default3
If IsNothing(l2.Lieferdatum) = False Then
strtempLieferdatum = l2.Lieferdatum.ToString.Substring(0, 10)
End If
- If l2.KartenNr.ToString = CardNo Then
+ If IsNothing(l2.KartenNr) = False Then
strtempKartenNr = l2.KartenNr.ToString
End If
If IsNothing(l2.PIN) = False Then
diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 563d1b4..330ad6d 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -55,15 +55,14 @@