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

Änderungen CSS und Design

Browse Source
This commit is contained in:
ja
2021-10-13 11:17:35 +02:00
parent 77da9a1945
commit f32861cf93
9 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
App_Code/RegexSammlung_VERAG.vb
View File

@@ -2,20 +2,8 @@
Imports Microsoft.VisualBasic
Public Class RegexSammlung_VERAG
Function getregEmail() As String
Dim strtemp As String = "\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*"
Return strtemp
End Function
Function getregUID() As String
Dim strtemp As String = "^[0-9]"
Return strtemp
End Function
Function getregPassword() As String
Dim strtemp As String = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$"
Return strtemp
End Function
Function getUsername() As String
'Not implemented yet!
Return ""
End Function
Public Shared email As String = "[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b"
Public Shared UID As String = "[0-9].{4,10}"
Public Shared PW As String = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$"
Public Shared UserName As String = "^(A-Z]).{4,30}$"
End Class

22
css/login/ForgotPW.css
View File

@@ -9,10 +9,12 @@
background-color: #fff;
overflow-y: clip;
}
#Login1_LoginButton {
color: #fff;
background-color: #003680;
}
#content_container {
display: flex;
justify-content: center;
@@ -20,22 +22,25 @@
width: 1024px;
height: 800px;
margin: 0 auto;
margin-top: 20px;
margin-top: 0px;
}
.container-fluid {
width: 464px;
height: 379px;
width: 400px;
height: 274px;
background-color: rgba(255,255,255,0.5);
margin: 0 auto;
margin-top: 220px;
margin-top: 50%;
}
#tbl_main {
font-family: Arial;
font-size: 11px;
border: 1px solid gray;
width: 400px;
height: 379px;
height: 250px;
}
#lbl_Ueberschrift {
background-color: #003680;
font-size: 2.55em;
@@ -65,6 +70,13 @@
color: #fff;
width: 140px;
height: 25px;
color: #fff;
font-size: 20px;
font-weight: 600;
margin-left: 122px;
margin-right: auto;
border:none;
margin-top: 40px;
}
#btn_Send {
background-color: #003680;

13
css/login/loginFLEX.css
View File

@@ -12,8 +12,7 @@
#Login1_LoginButton {
color: #fff;
background-color: #003680;
width:
}
}
#content_container {
display: flex;
justify-content: center;
@@ -21,21 +20,21 @@
width: 1024px;
height: 800px;
margin: 0 auto;
margin-top: 20px;
margin-top: 0px;
}
.container-fluid {
width: 400px;
height: 400px;
width: 400px;
height: 274px;
background-color: rgba(255,255,255,0.5);
margin: 0 auto;
margin-top: 220px;
margin-top: 50%;
}
#tbl_main {
font-family: Arial;
font-size: 11px;
border: 1px solid gray;
width: 400px;
height: 400px;
height: 250px;
}
#lbl_login {
color: #003680;

8
login/ChangePW.aspx
View File

@@ -94,11 +94,9 @@
</td>
<tr style="color:#003680;height:12px;">
<td>
<% Dim veragregex = New RegexSammlung_VERAG()
Dim veragpwVAL = veragregex.getregPassword()%>
<td>
<asp:RequiredFieldValidator ID="reqPassw1txt" runat="server" ErrorMessage="Bitte ein Passwort eingeben!" ControlToValidate="txt_Pw" Display="Dynamic"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Pw" runat="server" ID="regexval_txt_Pw" ValidationGroup="TXT_val" ValidationExpression="<%=veragpwVAL %>" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Pw" runat="server" ID="regexval_txt_Pw" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</td>
</tr>
@@ -113,7 +111,7 @@
<td>
<asp:CompareValidator ID="confirmPasswordReq" runat="server" ControlToCompare="txt_Pw" ControlToValidate="txt_Pw_WH" ErrorMessage="Die Passwörter stimmen nicht überein!Bitte nochmals versuchen!" Display="Dynamic"></asp:CompareValidator>
<asp:RequiredFieldValidator ID="reqPasswtxt" runat="server" ErrorMessage="Bitte Passwort wiederholen!" ControlToValidate="txt_Pw_WH" Display="Dynamic"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Pw_WH" runat="server" ID="regexval_txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="<%=veragpwVAL %>" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Pw_WH" runat="server" ID="regexval_txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680;height:36.67px;">

3
login/ChangePW.aspx.vb
View File

@@ -5,7 +5,7 @@ Partial Class login_ChangePW
Protected Sub Page_Load(sender As Object, e As EventArgs)
Dim url = Request.ServerVariables("URL")
Session.Add("urltochangepw", url)
If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) Or VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing Then
If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing Then
If getDateoftoken(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1"))) = True Then
txt_Pw_WH.Enabled = False
regexval_txt_Pw_WH.Enabled = False
@@ -19,6 +19,7 @@ Partial Class login_ChangePW
End If
Else
MsgBox("Link ist abgelaufen. Bitte neue E-Mail senden.", MsgBoxStyle.Critical, "Error06")
Response.Redirect("ForgotPW.aspx")
End If
End Sub

15
login/ForgotPW.aspx
View File

@@ -73,11 +73,7 @@
</style>
</head>
<body>
<%Dim veragregex = New RegexSammlung_VERAG()
Dim regexUID As String = veragregex.getregUID()
Dim regexPWVal As String = veragregex.getregPassword()
'Dim regexUsername As String = veragregex.getUsername()
Dim regexemail As String = veragregex.getregEmail()%>
<div id="content_container">
<div class="container-fluid">
<form id="form1" runat="server">
@@ -85,7 +81,7 @@
<table id="tbl_main" cellpadding="0" style="margin:4px 4px 4px 4px; border: none;">
<tr style="color:#003680;height:35px;">
<td>
<asp:Button ID="btn_Back" runat="server" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" style="margin-left:114px; margin-right:auto;border:none" OnClick="btn_Back_Click"/>
<asp:Button ID="btn_Back" runat="server" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" style="" OnClick="btn_Back_Click"/>
</td>
</tr>
<tr style="color:#003680; height:32px;font-size:12px">
@@ -107,12 +103,13 @@
<td align="left" colspan="2">
<asp:TextBox ID="txtEmail" runat="server" Width="250px" ValidationGroup="Valtxtemail" Font-Size="1.125em" Text="E-Mail" CssClass="bg-email-icon" style="margin-left:22px;color:#003680" OnClick="this.value='';"/>
<asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="Valtxtemail" ValidationExpression="<%=regexemail %>" Display="Dynamic" ErrorMessage="Die E-Mail ist nicht im korrekten Format gegeben!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct Format!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</td></tr>
<tr style="color:#003680; height:30px;">
<td align="left" colspan="2">
<asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" Text="Username" Font-Size="1.125em" Width="250px" style="margin-left:22px;color:#003680" OnClick="this.value='';" />
</td></tr>
<asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Text="Username" Font-Size="1.125em" Width="250px" style="margin-left:22px;color:#003680" OnClick="this.value='';" />
<asp:RegularExpressionValidator ControlToValidate="txt_Username" runat="server" ID="regexval_txt_Username" ValidationGroup="Valtxtusername" ValidationExpression="^(A-Z]).{4,30}$" Display="Dynamic" ErrorMessage="The Username does not meet the requirements!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</td></tr>
<tr style="color:#003680; height:30px;">
<td align="right" colspan="2">
<asp:Label ID="lblMessage" runat="server" />

33
login/ForgotPW.aspx.vb
View File

@@ -18,6 +18,7 @@ Partial Class login_ForgotPW
Dim email As String
Dim tokenname As String
valreqtxtEmail.Validate()
If valreqtxtEmail.IsValid() = True Then
username = txt_Username.Text
password = String.Empty
@@ -77,11 +78,11 @@ Partial Class login_ForgotPW
tokenname = genToken(username, password, email)
End If
'SendEmail(username, password, email)
MsgBox("Mail would be sent successfully!")
'MsgBox("Mail would be sent successfully!")
lblMessage.ForeColor = Color.Green
lblMessage.Text = "Passwort wurde erfolgreich an die angegebene E-Mail Adresse gesendet."
ElseIf SendEmail(username, password, email, tokenname) = False Then
MsgBox("Mail would not be sent successfully!")
'MsgBox("Mail would not be sent successfully!")
lblMessage.ForeColor = Color.Red
lblMessage.Text = "Diese E-Mail ist nicht in unserer Datenbank vorhanden."
End If
@@ -102,20 +103,24 @@ Partial Class login_ForgotPW
Dim getdomianenvironment As String = String.Empty
Dim pagename As String = String.Empty
Dim ServPort As String = String.Empty
Dim mailto As String = String.Empty
Dim Betreff As String = String.Empty
Dim htmlbody As String = String.Empty
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME")
ServPort = ":" + Request.ServerVariables("SERVER_PORT")
'pagename = Request.ServerVariables("SCRIPT_NAME")
Dim mailto As String = email
Dim Betreff As String = "Passwort reset"
Dim htmlbody = String.Format("Sehr geehrte/r {0},<br /><br /> Bitte dem Link zum Zurücksetzen des Passwortes folgen:<br /><br /><br />.<br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br />Mit freundlichen Grüßen,", username, password)
mailto = email
Betreff = "Passwort reset"
htmlbody = String.Format("Sehr geehrte/r {0},<br /><br /> Bitte dem Link zum Zurücksetzen des Passwortes folgen:<br /><br /><br />.<br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br />Mit freundlichen Grüßen,", username, password)
ElseIf HttpContext.Current.Request.ServerVariables("SERVER_NAME") = Not "localhost" Then
getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME")
ServPort = String.Empty
'pagename = Request.ServerVariables("SCRIPT_NAME")
Dim mailto As String = email
Dim Betreff As String = "Passwort reset"
Dim htmlbody = String.Format("Sehr geehrte/r {0},<br /><br /> Bitte dem Link zum Zurücksetzen des Passwortes folgen:<br /><br /><br />.<br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br />Mit freundlichen Grüßen,", username, password)
mailto = email
Betreff = "Passwort reset"
htmlbody = String.Format("Sehr geehrte/r {0},<br /><br /> Bitte dem Link zum Zurücksetzen des Passwortes folgen:<br /><br /><br />.<br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br />Mit freundlichen Grüßen,", username, password)
End If
'Dim pg As String = Request.ServerVariables("URL")
'MsgBox("/" + ServPort + Request.ServerVariables("URL"))
@@ -126,11 +131,15 @@ Partial Class login_ForgotPW
If getDateoftoken(tokennametemp) = True Then
' Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx")
' Msg.Attachments.Add(attachment)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody)
If Not String.IsNullOrEmpty(mailto) AndAlso Not String.IsNullOrEmpty(Betreff) AndAlso String.IsNullOrEmpty(htmlbody) Then
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody)
Else
MsgBox("Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen.", vbAbort, "Error07")
End If
MsgBox("SENT")
Return True
Else
MsgBox("Error02: Mail not delivered!" & vbCrLf & "Neuer Token wird generiert.")
Return True
Else
MsgBox("Error02: Mail not delivered!" & vbCrLf & "Neuer Token wird generiert.")
tokennametemp = genToken(username, password, email)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody, tokenname)
Return False

27
login/login_FLEX.aspx
View File

@@ -110,9 +110,7 @@
}
</script>
</head>
<%Dim veragregex = New RegexSammlung_VERAG()
Dim regexUID As String = veragregex.getregUID()
Dim regexPWVal As String = veragregex.getregPassword()%>
<body onload="FocusOnInput()">
<div id="content_container">
<div class="container-fluid">
@@ -123,27 +121,28 @@
<table cellpadding="0" style="margin: 6px 0px 6px 6px;">
<tr style="color:#003680; height:30px;">
<td align="left" style="color:#fff;font-kerning:auto;">
<asp:Label ID="lbl_login" runat="server" style="color:#003680; font-size:20px;font-weight:700;" Text="Login"></asp:Label>
<asp:Label ID="lbl_login" runat="server" Text="Login"></asp:Label>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left">
<asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" Width = "250" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged" Text="User-ID / E-Mail" Font-Size="1.125em" style="margin-left:22px;color:#003680" OnClick="this.value='';"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="true" ValidationGroup="txt_checkUID" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_checkUID" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="<%=regexUID %>"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_checkUID" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="[0-9].{4,10}"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left" colspan="2">
<asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "250" ValidationGroup="txt_Username" required="true" Font-Size="1.125em" style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Username"></asp:TextBox>
<asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Please enter the Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator>
</td>
<asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(A-Z]).{4,30}$"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left" colspan="2">
<asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "250" Font-Size="1.125em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Password"></asp:TextBox>
<asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="<%=regexPWVal %>"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:23px;">
@@ -153,21 +152,19 @@
</tr>
<tr style="color:#003680; height:23px;">
<td align="left" colspan="2">
<asp:CheckBox ID="RememberMe" runat="server" Text="Remember me." />
<asp:CheckBox ID="RememberMe" runat="server" Text="Remember me." style="margin-left:22px;" />
</td>
<td align="right" colspan="4">
<a ID="LinkButton2" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-154px;margin-right:-42px"> I forgot my password!</a>
</td>
</tr>
<tr style="color:#003680; height:23px">
<td align="center" style="color:Red;" colspan="2">
<asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<td align="left" colspan="4">
<a ID="LinkButton2" runat="server" target="_top" href="ForgotPW.aspx"> I forgot my password!</a>
</td>
</tr>
</table>
</center>
</LayoutTemplate>

1
login/login_FLEX_iFrame.aspx
View File

@@ -85,6 +85,7 @@
<td>
<asp:TextBox ID="CustomerID" runat="server" TextMode="Number"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ErrorMessage="Die Kundennummer ist erforderlich." ToolTip="Die Kundennummer ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="CustomerIDregex" runat="server" ControlToValidate="CustomerID" Display="Dynamic" ValidationExpression="<%=RegexSammlung_VERAG.UID %>" ErrorMessage="Bitte gültige Zeichen verwenden"></asp:RegularExpressionValidator>
</td>
</tr>
<tr>