From e96a88be997cd334801cfa73fc099288c57fac8f Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 7 Feb 2022 16:41:43 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Formen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/SDL/Formtemplate EcoTAX.aspx.vb | 4 ++-- Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx.vb | 4 ++-- Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb | 6 +++--- Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb | 2 +- Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx.vb | 4 ++-- Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx.vb | 4 ++-- Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb | 2 +- login/login_FLEX.aspx.vb | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx.vb b/Customers/SDL/Formtemplate EcoTAX.aspx.vb index b1b60ce..25ec90e 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx.vb +++ b/Customers/SDL/Formtemplate EcoTAX.aspx.vb @@ -72,12 +72,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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.KfzKennzeichen = Kennzeichen AndAlso l2.KundenNr = KundenNr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History Then + If l2.KfzKennzeichen = Kennzeichen AndAlso l2.KundenNr = KundenNr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History And l2.KartenNr.ToString = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempPanNr As String = String.Empty diff --git a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx.vb b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx.vb index 756c049..619e6e2 100644 --- a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx.vb +++ b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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.KfzKennzeichen = Kennzeichen And l2.KundenNr = KundenNr And l2.SDLNr = SDLNr And l2.History = History Then + If l2.KfzKennzeichen = Kennzeichen And l2.KundenNr = KundenNr And l2.SDLNr = SDLNr And l2.History = History And l2.KartenNr.ToString = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempFREJUSCrdNr As String = String.Empty diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb index 3c07cc3..3eedd33 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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 And l2.History.ToString = History Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr.ToString = SDLNr 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 End If - If IsNothing(l2.KartenNr) = False Then + If l2.KartenNr.ToString = CardNo Then strtempKartenNr = l2.KartenNr.ToString End If If IsNothing(l2.PIN) = False Then diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb index 8218126..d8d6f05 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb @@ -74,7 +74,7 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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)) diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx.vb b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx.vb index fd2d835..ff676d1 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx.vb +++ b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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 = SDLNr AndAlso l2.History = History Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr.ToString = SDLNr And l2.KartenNr.ToString = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempKartenNr As String = String.Empty diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx.vb b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx.vb index 58ca002..3696204 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx.vb +++ b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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 = SDLNr AndAlso l2.History = History Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History And l2.KartenNr.ToString = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempUmstellungsdatum As String = String.Empty Dim strtempKat As String = String.Empty diff --git a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb index 3db030c..7f0a42b 100644 --- a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.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 = SDLNr And l2.KartenNr = CardNo Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr.ToString = SDLNr And l2.KartenNr.ToString = CardNo Then Dim strtempbestellNr As String = String.Empty Dim strtempUmstellungsdatum As String = String.Empty Dim strtempVertragsabschlussdatum As String = String.Empty diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index e0f80f2..160e26b 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -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.2 * VERAG_VARIABLES.GetCpuSpeed()) + intzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(95, 200), Math.Pow(2, 8)) 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