edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
ja
2022-01-13 11:31:15 +01:00
parent dd5dc89c57
commit f716cfbc4e
6 changed files with 1253 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App_Code/TestPerformance.vb
View File

@@ -193,8 +193,6 @@ Public Class TestPerformance
sw2.Reset()
Next
For Each zp1 In arrzeitp1
If arrzeitp1(zp1) < arrzeitp2(zp1) Then
arrzeitp3.Add(arrzeitp1.Item(zp1))

4
App_Code/VERAG_VARIABLES.vb
View File

@@ -51,7 +51,6 @@ Public Class VERAG_VARIABLES
Argon.DegreeOfParallelism = 32
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 5)
Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
Return Argon.GetBytes(nHash)
End If
@@ -70,12 +69,11 @@ Public Class VERAG_VARIABLES
Else
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt
Argon.DegreeOfParallelism = 22
Argon.DegreeOfParallelism = 32
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 5)
Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
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

142
Customers/LKWs.aspx
View File

@@ -88,28 +88,25 @@
<!-- <asp:Table ID="tbl_mainpage" ClientIDMode="Static" runat="server" Width="100%" style="background-color:#fff;overflow-y:auto;" CssClass="table table-striped col-12">
<asp:TableHeaderRow ID="headrow1" runat="server" style="background-color:#043381;color:#fff;height:10px"><asp:TableHeaderCell ID="tblhc_SDLNr">SDL-Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
</asp:Table>-->
<table id="tablemain" runat="server" class="col-12">
<thead>
<tr style="background-color: #043381; color: #fff;height:23px">
<th style="text-align: center; height: 23px">
<td style="font-weight: 600; color: white">SDL</td>
</th>
<th style="text-align: center; height: 23px">
<td style="font-weight: 600; color: white; text-align: center;">Bezeichnung</td>
</th>
<th style="text-align: center; height: 23px">
<td style="font-weight: 600; color: white; text-align: center">Gültig bis</td>
</th>
<th style="text-align: center; height: 23px">
<td style="font-weight: 600; color: white; text-align: center">Kartennummer</td>
</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="5" class="dataTables_empty">Lade Daten mittels Klicken auf einen der beiden linken Knöpfe.</td>
</tr>
</tbody>
<table runat="server" id="tablemain" class="col-12">
<tr style="background-color: #043381; color: #fff">
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">SDL
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">Bezeichnung
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">Gültig bis
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">Kartennummer
</td>
</th>
</tr>
</table>
</div>
</div>
@@ -152,28 +149,29 @@
<!-- <asp:Table ID="tbl_mainpage_M" ClientIDMode="Static" runat="server" Width="100%" CssClass="table table-striped col-12">
<asp:TableHeaderRow runat="server" ID="headrow_M" style="background-color:#043381;color:#fff"><asp:TableHeaderCell ID="tblhc_SDLNr_M">SDL_Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez_M">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig_M">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr_M">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
</asp:Table>-->
<table id="tablemain_m" runat="server" class="col-12">
<thead>
<tr style="background-color: #043381; color: #fff; height: 1.375em/*22.4px*/">
<th style="text-align: center; height: 1.375em/*22.4px*/">
<td style="font-weight: 500;color:white">SDL</td>
</th>
<th style="text-align: center; height: 1.375em/*22.4px*/">
<td style="font-weight: 500; color: white; text-align: center">Bezeichnung</td>
</th>
<th style="text-align: center; height: 1.375em/*22.4px*/">
<td style="font-weight: 500; color: white; text-align: center">Gültig bis</td>
</th>
<th style="text-align: center; height: 1.375em/*22.4px*/">
<td style="font-weight: 500; color: white; text-align: center">Kartennummer</td>
</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="12" class="dataTables_empty">Lade Daten mittels Klicken auf einen der beiden linken Knöpfe.</td>
</tr>
</tbody>
<table runat="server" id="tablemain_m" class="col-12">
<tr style="background-color:#043381;color:#fff">
<th style="text-align:center">
<td style="font-weight: 600;color:white">
SDL
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">
Bezeichnung
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">
Gültig bis
</td>
</th>
<th style="text-align: center">
<td style="font-weight: 600; color: white; text-align: center">
Kartennummer
</td>
</th>
</tr>
</table>
</div>
</div>
@@ -361,45 +359,7 @@
}
</script>
<script type="text/javascript">
function renderTable(result) {
let dtData = [];
// Data tables requires all data to be stuffed into a generic jagged array, so loop through our
// typed object and create one.
$.each(result, function () {
dtData.push([
this._SDLNr,
this._Bez,
this._GueltigBis,
this._Kartnr
]);
});
$('<%=tablemain.ClientID%>').dataTable({
'aaData': dtData,
"bJQueryUI": true
});
}
function renderTable_M(result_M) {
let dtData_M = [];
// Data tables requires all data to be stuffed into a generic jagged array, so loop through our
// typed object and create one.
$.each(result_M, function () {
dtData_M.push([
this._SDLNr,
this._Bez,
this._GueltigBis,
this._Kartnr
]);
});
$('<%=tablemain_m.ClientID%>').dataTable({
'aaData': dtData_M,
"bJQueryUI": true
});
}
<script type="text/javascript">
function doPostBack(id) {
let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder.ClientID%>');
let natplaceholder = document.getElementById('<%=lbl_Placeholder.ClientID%>');
@@ -437,16 +397,15 @@
success: function (data) {
result = data.d;
// addheader();
let strHTML = '<tr><th><td>SDL-Nr</td></th><th><td>Bezeichnung</td></th><th><td>Gueltig bis</td></th><th><td>Karten Nummer</td></th></tr>';
let strHTML = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
alert('Horray! 200 status code!');
// alert(result.rows.length)
$(result).each(function () {
$(JSONObj).each(function () {
let row = $(this)[0];
strHTML += '<tr><td>' + row["SDL"] + '</td><td>' + row["Bez"] + '</td><td>' + row["Gueltigbis"] + '</td><td>' + row["KartNr"] + '</td></tr>';
alert(row)
$('#<%=tbl_mainpage.ClientID%>').innerHTML = strHTML;
alert(strHTML)
});
$('#<%=tablemain.ClientID%>').html(strHTML);
},
error: function (jqXHR, textStatus, errorThrown) {
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
@@ -499,16 +458,15 @@
success: function (data_m) {
result = data_m.d;
// addheader();
let strHTML = '<tr><th><td> SDL-Nr </td></th><th><td> Bezeichnung </td></th><th><td> Gueltig bis</td></th><th><td>Karten Nummer</td></th></tr>';
let strHTML = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
alert('Horray! 200 status code!');
$(result).each(function () {
let row = $(this)[0];
strHTML += '<tr><td>' + row["SDL"] + '</td><td>' + row["Bez"] + '</td><td>' + row["Gueltigbis"] + '</td><td>' + row["KartNr"] + '</td></tr>';
alert(row)
$('#<%=tbl_mainpage_M.ClientID%>').innerHTML = strHTML;
alert(strHTML)
});
$('#<%=tablemain_m.ClientID%>').html(strHTML);
},
error: function (jqXHR, textStatus, errorThrown) {
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);

4
Global.asax
View File

@@ -18,14 +18,14 @@
void Application_End(object sender, EventArgs e)
{
}
void Application_Error(object sender, EventArgs e)
{
// Code, der ausgeführt wird, wenn ein nicht behandelter Fehler auftritt
//Response.Redirect("../login/Error.aspx");
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("ja@verag.ag", VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString["Errcode"]), "Beim Besuch der Seite:" + Request.QueryString["Errcode"] + "ist es zum Fehler:" + VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString["Errcode"]) + "gekommen." + System.Environment.NewLine + "Bitte Entschuldigen Sie die Unannehmlichkeiten.", "support@verag.ag", true, true, "", null);
}

2213
VERAG_Homepage/{11EF0CDA-BC19-40FB-91C4-25C81F3A27AC}/CodeAnalysisLog.xml
View File

File diff suppressed because it is too large Load Diff

2
login/login_FLEX.aspx.vb
View File

@@ -246,7 +246,7 @@ Partial Class login_FLEX
Login1.FailureText = VERAG_VARIABLES.geterrornumb + "Username is not in the database!"
End If
If String.Equals(tb3.Text, dr("Password")) = True Then
intzahl = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 12))
intzahl = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 10))
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