Änderungen wieder rückgängig zu 15 Uhr heute

This commit is contained in:
ja
2021-11-18 16:10:08 +01:00
parent 6ba2e0d3e0
commit 30cf0e1320
6 changed files with 150 additions and 175 deletions

View File

@@ -47,12 +47,6 @@
margin-top:40px; margin-top:40px;
} }
#lbl_Ueberschrift {
background-color: #003680;
font-size: 2.55em;
color: #fff;
}
.txt_design { .txt_design {
color: #003680; color: #003680;
font-size: 1.65em; font-size: 1.65em;

View File

@@ -78,16 +78,19 @@
background-color: #fff; background-color: #fff;
overflow-y: clip; overflow-y: clip;
overflow-x: clip; overflow-x: clip;
max-width:390px; max-width: 390px;
} }
h1 { h1 {
color: #043381; color: #043381;
font-size: 22px; font-size: 22px;
} }
h2 { h2 {
color: #043381; color: #043381;
font-size: 30px; font-size: 30px;
} }
#content_container { #content_container {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -95,14 +98,14 @@
width: 390px; width: 390px;
height: 613px; height: 613px;
margin: 0 auto; margin: 0 auto;
margin-left:10%; margin-left: 10%;
} }
.container-fluid { .container-fluid {
width: 390px; width: 390px;
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);
height: 613px; height: 613px;
top:50%; top: 50%;
bottom: -4px; bottom: -4px;
left: -195px; left: -195px;
right: 520px; right: 520px;
@@ -115,18 +118,19 @@
border: 1px solid gray; border: 1px solid gray;
width: 300px; width: 300px;
height: 613px; height: 613px;
margin-top:80px; margin-top: 80px;
} }
#btn_submitpw_M{
#btn_submitpw_M {
background-color: #003680; background-color: #003680;
color: #fff; color: #fff;
width: 325px; width: 325px;
height: 32px; height: 32px;
margin-bottom: 0px; margin-bottom: 0px;
margin-left:-15px; margin-left: -15px;
padding-inline: 2px 2px; padding-inline: 2px 2px;
padding: -10px 0px 10px 1px; padding: -10px 0px 10px 1px;
font-weight:600; font-weight: 600;
} }
#lbl_Ueberschrift_M { #lbl_Ueberschrift_M {
@@ -231,41 +235,33 @@
<table id="main_table" runat="server" cellpadding="0" style="margin: 5% 2px 2px 2px; border:none;width:306px"> <table id="main_table" runat="server" cellpadding="0" style="margin: 5% 2px 2px 2px; border:none;width:306px">
<tr style="color:#003680;height:55px;background-color:none"> <tr style="color:#003680;height:55px;background-color:none">
<td> <td>
<asp:Label ID="lbl_Ueberschrift_1" runat="server" Text="Password-Change" style="margin-left:46px;font-weight:600;font-size:2.139em;color:#043381"></asp:Label> <asp:Label ID="lbl_Ueberschrift" runat="server" Text="Password-Change" style="margin-left:50px;color:#043381;font-weight:600" Font-Size="26px"></asp:Label>
</td> </td>
</tr> </tr>
<tr style="border:2px solid #003680; margin:4px auto 4px 0px;background-color:rgba(255,255,255,0.5)"> <tr style="border:2px solid #003680; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
<td> <td>
<table> <table>
<tr> <tr>
<td> <td>
<asp:Image ID="ImageButton1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/> <asp:Image ID="Image2" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:275px"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<asp:Label ID="Label2" runat="server" style="color:#003680;margin-left:44px">The Password has to contain at least:</asp:Label> <asp:Label ID="Label2" runat="server" style="color:#003680;margin-left:22px">The Password has to contain:</asp:Label>
</td> </td>
</tr> </tr>
</table> </table>
<ul style="list-style:circle"> <ul style="list-style:circle;margin-left:48px">
<li> <li>
<asp:Label ID="Label11" runat="server" style="color:#003680;margin-left:22px">1 Uppercase</asp:Label> <asp:Label ID="Label4" runat="server" style="color:#003680;">1 Upper- and 1 lowercase letter</asp:Label>
</li> </li>
<li> <li>
<asp:Label ID="Label8" runat="server" style="color:#003680;margin-left:22px">1 Downcase </asp:Label> <asp:Label ID="Label7" runat="server" style="color:#003680;">one special letter</asp:Label>
</li> </li>
<li> <li>
<asp:Label ID="Label9" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label> <asp:Label ID="Label8" runat="server" style="color:#003680;margin-right:0px">between 4 and 30 characters</asp:Label>
</li>
<li>
<asp:Label ID="Label10" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">at an minimal length of 4 and an maximal</asp:Label>
</li>
</ul>
<ul style="list-style:none">
<li style="margin-top:-15px">
<asp:Label ID="Label12" runat="server" style="color:#003680;margin-left:-7px;">length of 30 characters.</asp:Label>
</li> </li>
</ul> </ul>
</td> </td>
@@ -316,39 +312,36 @@
</div> </div>
<!--Smartphone-Bildschirme--> <!--Smartphone-Bildschirme-->
<div class="d-md-none"> <div class="d-md-none">
<table id="tbl_main_M" cellpadding="0" style="margin: 2px 4px 1px 2px;border:none"> <table id="tbl_main_M" cellpadding="0" style="margin: 10px 4px 1px 2px;border:none;height:50px">
<tr style="color:#003680;height:48px;"> <tr style="color:#003680;height:25px;margin-left:105px">
<td> <td>
<asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="margin-left:35px;font-weight:700;color:#003681;background-color:none;font-size:26px"></asp:Label> <asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="color:#003681;background-color:none;font-size:26px" Font-Bold="true"></asp:Label>
</td> </td>
</tr> </tr>
<tr style="border:0.5px solid #003680; background-color:rgba(255,255,255,0.5);height:12px; width:82%"> <tr style="border:2px solid #003680; width:320px; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
<td style="width:308px" colspan="2"> <td>
<table style="margin-left:42px;height:auto"> <table>
<tr> <tr>
<td> <td>
<asp:Label ID="Label1" runat="server" style="color:#003680;margin-left:52px">The Password has to contain at least:</asp:Label> <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label1" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
</td> </td>
</tr> </tr>
</table> </table>
<ul style="list-style:circle;margin-left:48px"> <ul style="list-style:circle;margin-left:48px">
<li> <li>
<asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:2px">1 Uppercase</asp:Label> <asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:2px">1 Upper- and 1 lowercase letter</asp:Label>
</li> </li>
<li> <li>
<asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:2px">1 Downcase </asp:Label> <asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:2px">one special letter</asp:Label>
</li> </li>
<li> <li>
<asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:2px">and one special letter</asp:Label> <asp:Label ID="Label6" runat="server" style="color:#003680;margin-left:2px;margin-right:0px">between 4 and 30 characters</asp:Label>
</li>
<li>
<asp:Label ID="Label6" runat="server" style="color:#003680;margin-left:2px;margin-right:0px">at an minimal length of 4 and an maximal</asp:Label>
</li>
</ul>
<ul style="list-style:none">
<li style="margin-top:-15px">
<asp:Label ID="Label7" runat="server" style="color:#003680;margin-left:48px;">length of 30 characters.</asp:Label>
</li> </li>
</ul> </ul>
</td> </td>

View File

@@ -207,11 +207,10 @@ Partial Class login_Change_PW
End If End If
If regexval_txt_Pw.IsValid = True Then If regexval_txt_Pw.IsValid = True Then
Using con As New SqlConnection(ConnectionString)
Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [Password]=@Password WHERE [Username]=@Username AND [UserId]=@UserId") Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [Password]=@Password WHERE [Username]=@Username AND [UserId]=@UserId")
' cmd.CommandType = CommandType.StoredProcedure ' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", usrname) cmd.Parameters.AddWithValue("@Username", usrname)
cmd.Parameters.AddWithValue("@Password", tempstr) cmd.Parameters.AddWithValue("@Password", txt_Pw_WH.Text)
cmd.Parameters.AddWithValue("@UserId", UsrID) cmd.Parameters.AddWithValue("@UserId", UsrID)
cmd.Connection = con cmd.Connection = con
con.Open() con.Open()
@@ -220,15 +219,16 @@ Partial Class login_Change_PW
btn_submitpw.Visible = True btn_submitpw.Visible = True
Else Else
VERAG_VARIABLES.seterrorcount(25) VERAG_VARIABLES.seterrorcount(25)
lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Fehler bei der Behebung des Passwortwechsels." 'lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Fehler bei der Behebung des Passwortwechsels."
End If End If
End Using End Using
con.Close() con.Close()
End Using End Using
End If
Else Else
VERAG_VARIABLES.seterrorcount(22) VERAG_VARIABLES.seterrorcount(22)
lbl_messagetext_M.ForeColor = Drawing.Color.Red 'lbl_messagetext_M.ForeColor = Drawing.Color.Red
lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb() + "Error bei der Validierung des Kennwortes." 'lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb() + "Error bei der Validierung des Kennwortes."
End If End If
Catch ex As Exception Catch ex As Exception
lbl_messagetext.Text = ex.Message lbl_messagetext.Text = ex.Message
@@ -245,7 +245,7 @@ Partial Class login_Change_PW
ElseIf tempstr = "Error01" Then ElseIf tempstr = "Error01" Then
regexval_txt_Pw.ForeColor = Drawing.Color.MediumVioletRed regexval_txt_Pw.ForeColor = Drawing.Color.MediumVioletRed
VERAG_VARIABLES.seterrorcount(2) VERAG_VARIABLES.seterrorcount(2)
regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!" 'regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Passwords could not be found!"
' Msg = "PW nicht erfolgreich geändert!" ' Msg = "PW nicht erfolgreich geändert!"
' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1 ' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
' Title = "Error" ' Title = "Error"
@@ -267,7 +267,7 @@ Partial Class login_Change_PW
' btn_submitpw.Enabled = True ' btn_submitpw.Enabled = True
Else Else
lbl_messagetext.ForeColor = Drawing.Color.Red lbl_messagetext.ForeColor = Drawing.Color.Red
lbl_messagetext.Text = "Passwörter stimmen nicht überein." lbl_messagetext.Text = "No matching Passwords found!"
'btn_submitpw.Enabled = False 'btn_submitpw.Enabled = False
End If End If
End Sub End Sub
@@ -301,7 +301,7 @@ Partial Class login_Change_PW
'btn_submitpw_M.Enabled = True 'btn_submitpw_M.Enabled = True
Else Else
lbl_messagetext_M.ForeColor = Drawing.Color.Red lbl_messagetext_M.ForeColor = Drawing.Color.Red
lbl_messagetext_M.Text = "Passwörter stimmen nicht überein." lbl_messagetext_M.Text = "No matching Passwords found. Try again!"
'btn_submitpw.Enabled = False 'btn_submitpw.Enabled = False
End If End If
End Sub End Sub
@@ -327,7 +327,6 @@ Partial Class login_Change_PW
ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;" ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;" 'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
End If End If
If regexval_txt_Pw_WH.IsValid Then
Using con As New SqlConnection(ConnectionString) Using con As New SqlConnection(ConnectionString)
' Using cmd As New SqlCommand("Validate_User") ' Using cmd As New SqlCommand("Validate_User")
Using cmd As New SqlCommand("SELECT UserId,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND UserId=@UserId And UserId=@UserId") Using cmd As New SqlCommand("SELECT UserId,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND UserId=@UserId And UserId=@UserId")
@@ -343,24 +342,21 @@ Partial Class login_Change_PW
Dim dr As SqlDataReader = cmd.ExecuteReader() Dim dr As SqlDataReader = cmd.ExecuteReader()
If dr.HasRows Then If dr.HasRows Then
dr.Read() dr.Read()
If String.Equals(txt_Pw_M.Text, dr("Password").ToString) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString) = False Then If String.Equals(txt_Pw_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Then
tempstr = txt_Pw_M.Text tempstr = txt_Pw_M.Text
Else Else
lbl_messagetext_M.ForeColor = Drawing.Color.Red lbl_messagetext_M.ForeColor = Drawing.Color.Red
lbl_messagetext_M.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!" lbl_messagetext_M.Text = "The Passwords have to differ from the older ones."
End If End If
End If End If
dr.Close() dr.Close()
End Using End Using
con.Close() con.Close()
End Using End Using
Else
tempstr = "Error2"
End If
Else Else
tempstr = "Error01" tempstr = "Error01"
End If End If
If String.Equals(txt_Pw_WH_M.Text, tempstr) = True AndAlso String.Equals(txt_Pw_M.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True And String.IsNullOrEmpty(txt_Pw_WH.Text) = True And String.Equals(tempstr, "Error01") = False And String.Equals(tempstr, "Error02") = False Then If String.Equals(txt_Pw_WH_M.Text, tempstr) = True AndAlso String.Equals(txt_Pw_M.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True And String.IsNullOrEmpty(txt_Pw_WH.Text) = True And String.Equals(tempstr, "Error01") = False Then
Try Try
ConnectionString = "" ConnectionString = ""
Dim usrname As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")).ToString Dim usrname As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")).ToString
@@ -384,7 +380,7 @@ Partial Class login_Change_PW
If String.Equals(usrname, VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt("Par2"), CompareMethod.Text) = True Then If String.Equals(usrname, VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt("Par2"), CompareMethod.Text) = True Then
cmd.ExecuteNonQuery() cmd.ExecuteNonQuery()
regexval_txt_Pw_M.ForeColor = Drawing.Color.Green regexval_txt_Pw_M.ForeColor = Drawing.Color.Green
regexval_txt_Pw_M.Text = "Passwort wurde erfolgreich geändert!" regexval_txt_Pw_M.Text = "Passwort has been changed successfully!"
End If End If
End Using End Using
con.Close() con.Close()
@@ -401,7 +397,7 @@ Partial Class login_Change_PW
ElseIf tempstr = "Error01" Then ElseIf tempstr = "Error01" Then
regexval_txt_Pw_M.ForeColor = Drawing.Color.MediumVioletRed regexval_txt_Pw_M.ForeColor = Drawing.Color.MediumVioletRed
VERAG_VARIABLES.seterrorcount(2) VERAG_VARIABLES.seterrorcount(2)
regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!" 'regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!"
' Msg = "PW nicht erfolgreich geändert!" ' Msg = "PW nicht erfolgreich geändert!"
' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1 ' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
' Title = "Error" ' Title = "Error"

View File

@@ -93,15 +93,11 @@
font-family: Arial; font-family: Arial;
font-size: 11px; font-size: 11px;
border: 1px solid gray; border: 1px solid gray;
width: 295px; width: 395px;
height: 713px; height: 713px;
margin-left:2px;
}
#lbl_Ueberschrift_M {
background-color: #003680;
font-size: 1.85em;
color: #fff;
} }
#lbl_login_M { #lbl_login_M {
background-color: #003680; background-color: #003680;
font-size: 2em; font-size: 2em;
@@ -290,12 +286,12 @@
<table id="tbl_main" cellpadding="0" style="margin: 14px auto 14px auto; border:none;"> <table id="tbl_main" cellpadding="0" style="margin: 14px auto 14px auto; border:none;">
<tr style="color:#003680;height:48px;"> <tr style="color:#003680;height:48px;">
<td> <td>
<asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/> <asp:LinkButton ID="btn_Back" runat="server" CssClass="btn btn-primary" Width="265px" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px;text-align:center"><center><label for="btn_Back" runat="server">Back</label></center></asp:LinkButton>
</td> </td>
</tr> </tr>
<tr style="color:#003680; height:32px;font-size:14px"> <tr style="color:#003680; height:32px;font-size:14px">
<td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;"> <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">
<asp:Label ID="lbl_PWvergessen" Text="Forgot your Password?" runat="server" style="color:#003680; margin-left:79px;font-size:20px;font-weight:300"></asp:Label> <asp:Label ID="lbl_PWvergessen" Text="Forgot your Password?" runat="server" style="color:#003680; margin-left:79px;font-size:19px;font-weight:300"></asp:Label>
</td></tr> </td></tr>
<!-- <tr style=" background-color:#fff; color:#003680; height:30px;font-size:12px"> <!-- <tr style=" background-color:#fff; color:#003680; height:30px;font-size:12px">
<td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;"> <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">
@@ -330,28 +326,23 @@
<asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien einer E-Mail überein" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien einer E-Mail überein" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien der Domäne überein" ForeColor="Red"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien der Domäne überein" ForeColor="Red"></asp:RegularExpressionValidator>
</td></tr> </td></tr>
<tr>
<td>
<asp:Button Text="back" ID="btn_BACKafterlogin" style="background-color:#003680;color:#fff;visibility:hidden" runat="server" />
</td>
</tr>
</table> </table>
</div> </div>
<!--Smartphone-Bildschirme--> <!--Smartphone-Bildschirme-->
<div class="d-md-none"> <div class="d-md-none">
<table id="tbl_main_M" cellpadding="0" style="margin:10px 8px 10px 8px; border: none;"> <table id="tbl_main_M" cellpadding="0" style="margin:40% 50% 50% 4px; border: none;">
<tr style="color:#003680;height:65px;margin-top:-70px"> <tr style="color:#003680;height:65px;margin-top:-70px">
<td> <td>
<asp:Button ID="btn_Back_M" runat="server" Text="Back" OnClick="btn_Back_Click" Height="37px"/> <asp:Button ID="btn_Back_M" runat="server" CssClass="btn btn-small btn-primary" Width="325px" Text="Back" OnClick="btn_Back_Click" Height="38px"/>
</td> </td>
</tr> </tr>
<tr style="color:#003680; height:92px;"> <tr style="color:#003680; height:92px;">
<td align="left" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;"> <td align="left" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">
<asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:22px; "></asp:Label> <asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:19px; "></asp:Label>
</td></tr> </td></tr>
<tr style="color:#003680;height:20px"> <tr style="color:#003680;height:20px">
<td> <td>
<asp:Label ID="lbl_filldatahere_M" Text="Fill in your data here" runat="server" style="color:#003680;margin-left:67px;font-weight:300" Font-Size="22px"></asp:Label> <asp:Label ID="lbl_filldatahere_M" Text="Fill in your data here" runat="server" style="color:#003680;margin-left:72px;font-weight:300" Font-Size="22px"></asp:Label>
</td> </td>
</tr> </tr>
<tr style="color:#003680;height:40px;"> <tr style="color:#003680;height:40px;">
@@ -369,7 +360,11 @@
<asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="val-mobil" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" /> <asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="val-mobil" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" />
<asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Text="" ErrorMessage="*" SetFocusOnError="true"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Text="" ErrorMessage="*" SetFocusOnError="true"></asp:RequiredFieldValidator>
</td></tr> </td></tr>
<tr style="color:#003680; height:50px;"> <tr style="color:#003680; height:35px;"><td>
<asp:Button ID="btn_Send_M" runat="server" Text="Send" CssClass="btn btn-small btn-primary" Width="325px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-top:16px;margin-left:22px;border:none" OnClick="btn_Send_M_Click" Height="38px" />
</td></tr>
<tr style="color:#003680; height:50px;margin-top:20px">
<td align="right" colspan="2"> <td align="right" colspan="2">
<asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" /> <asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" />
<asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="24px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{1,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="24px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{1,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
@@ -377,10 +372,7 @@
<asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="24px" ErrorMessage="Try again. The Username don't meet the rquirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="24px" ErrorMessage="Try again. The Username don't meet the rquirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
</td></tr> </td></tr>
<tr style="color:#003680; height:40px;"><td>
<asp:Button ID="btn_Send_M" runat="server" Text="Send" Width="325px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_M_Click" Height="37px" />
</td></tr>
<tr><td> <tr><td>
</td></tr> </td></tr>
</table> </table>

View File

@@ -62,13 +62,13 @@ Partial Class ForgotPW
regexval_txt_Email_2.Validate() regexval_txt_Email_2.Validate()
If regexval_txt_Email_2.IsValid = True Then If regexval_txt_Email_2.IsValid = True Then
email = txtEmail.Text email = txtEmail.Text
lblMessage.ForeColor = Drawing.Color.Lime lblMessage.ForeColor = Drawing.Color.Green
lblMessage.Text = "E-mail Addresse ist validiert.." lblMessage.Text = "E-mail Addresse ist validiert.."
End If End If
Else Else
regexval_txt_Email.Validate() regexval_txt_Email.Validate()
If regexval_txt_Email.IsValid = True Then If regexval_txt_Email.IsValid = True Then
lblMessage.ForeColor = Drawing.Color.Lime lblMessage.ForeColor = Drawing.Color.Green
lblMessage.Text = "E-mail Adresse ist korrekt." lblMessage.Text = "E-mail Adresse ist korrekt."
email = txtEmail.Text email = txtEmail.Text
End If End If
@@ -98,7 +98,7 @@ Partial Class ForgotPW
Else Else
username = txt_Username.Text username = txt_Username.Text
isusrnmright = True isusrnmright = True
check_UserName_regex.ForeColor = Drawing.Color.Lime check_UserName_regex.ForeColor = Drawing.Color.Green
check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden." check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden."
End If End If
End If End If
@@ -147,7 +147,7 @@ Partial Class ForgotPW
ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then
check_UserName_regex.MatchTimeout = 3000 check_UserName_regex.MatchTimeout = 3000
VERAG_VARIABLES.seterrorcount(5) VERAG_VARIABLES.seterrorcount(5)
check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Kein passender Benutzername wurde in der Datenbank gefunden!" check_UserName_regex.ErrorMessage = "Kein passender Benutzername wurde in der Datenbank gefunden!"
isusrnmright = False isusrnmright = False
Try Try
check_UserName_regex.Validate() check_UserName_regex.Validate()
@@ -164,7 +164,7 @@ Partial Class ForgotPW
lblMessage.ForeColor = Color.Red lblMessage.ForeColor = Color.Red
isemailright = False isemailright = False
VERAG_VARIABLES.seterrorcount(6) VERAG_VARIABLES.seterrorcount(6)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen." lblMessage.Text = "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen."
Else Else
lblMessage_M.ForeColor = Color.Red lblMessage_M.ForeColor = Color.Red
isemailright = False isemailright = False

View File

@@ -115,7 +115,7 @@
align-items: center; align-items: center;
width: 395px; width: 395px;
height: 613px; height: 613px;
margin: 0 auto auto -2px; margin: 0 auto auto -2px 0px;
margin-top: 0px; margin-top: 0px;
} }
@@ -125,9 +125,9 @@
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);
top:50%; top:50%;
bottom: auto; bottom: auto;
left: -192px; left: -132px;
right: 520px; right: 520px;
margin: auto auto auto -2px; margin: auto auto auto 45px;
} }
#tbl_main_M { #tbl_main_M {
font-family: Arial; font-family: Arial;
@@ -135,7 +135,7 @@
border: 1px solid gray; border: 1px solid gray;
width: 295px; width: 295px;
height: 613px; height: 613px;
margin: auto auto auto -2px; margin: 5px auto auto 0px;
} }
#lbl_Ueberschrift_M { #lbl_Ueberschrift_M {
background-color: #003680; background-color: #003680;
@@ -274,7 +274,7 @@
<table id="tbl_main" cellpadding="0" style="margin: 22px 0px 6px 6px; border:none"> <table id="tbl_main" cellpadding="0" style="margin: 22px 0px 6px 6px; border:none">
<tr style="color:#003680; height:30px;"> <tr style="color:#003680; height:30px;">
<td align="left" style="color:#fff;font-kerning:auto;"> <td align="left" style="color:#fff;font-kerning:auto;">
<asp:Label ID="lbl_login" runat="server" Text="Login" style=" color: #003680;font-size: 1.320901320901321em; font-weight: 600; margin-left:162px;"></asp:Label> <asp:Label ID="lbl_Ueberschrift" runat="server" style="color:#003680;font-weight:600;font-size:20px;margin-left:36%" Text="Login"></asp:Label>
</td> </td>
</tr> </tr>
<tr style="color:#003680; height:46px;"> <tr style="color:#003680; height:46px;">
@@ -325,10 +325,10 @@
<asp:Login ID = "Login2" runat = "server" OnAuthenticate= "ValidateUser" DisplayRememberMe="true" DestinationPageUrl="../Customers/CustomsAviso.aspx" ValidateRequestMode="Enabled"> <asp:Login ID = "Login2" runat = "server" OnAuthenticate= "ValidateUser" DisplayRememberMe="true" DestinationPageUrl="../Customers/CustomsAviso.aspx" ValidateRequestMode="Enabled">
<LayoutTemplate> <LayoutTemplate>
<center> <center>
<table id="tbl_main_M" cellpadding="0" style="margin: 4px 0px 4px 4px;border:none"> <table id="tbl_main_M" cellpadding="0" style="margin: 0px 0px 0px -22px;border:none">
<tr style="color:#003680; height:30px;"> <tr style="color:#003680; height:30px;">
<td align="left" style="color:#fff;font-kerning:auto;"> <td align="left" style="color:#fff;font-kerning:auto;">
<asp:Label ID="lbl_login_M" runat="server" Text="Login" style=" color: #003680;font-size: 2.320901320901321em; font-weight: 800; margin-left:132px;margin-top:20px"></asp:Label> <asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Login" style="color: #003680; margin-left:132px;margin-top:20px;font-size:26px;font-weight:600"></asp:Label>
</td> </td>
</tr> </tr>
<tr style="color:#003680; height:86px"> <tr style="color:#003680; height:86px">
@@ -356,10 +356,10 @@
</tr> </tr>
<tr style="color:#003680; height:46px;"> <tr style="color:#003680; height:46px;">
<td align="left" colspan="2"> <td align="left" colspan="2">
<asp:CheckBox ID="RememberMe_M" runat="server" ValidationGroup="Login_M" style="margin-left:22px;"/><label for="RememberMe_M" id="lbl_for_chkbox_M">Remember me.</label> <asp:CheckBox ID="RememberMe_M" runat="server" ValidationGroup="Login_M" style="margin-left:35px;"/><label for="RememberMe_M" id="lbl_for_chkbox_M">Remember me.</label>
</td> </td>
<td align="right" colspan="2"> <td align="right" colspan="2">
<asp:LinkButton id="btn_ForgotPW_M" runat="server" target="_top" PostBackUrl="ForgotPW.aspx" href="ForgotPW.aspx" style="margin-left:-164px;margin-right:-62px;">I forgot my password</asp:LinkButton> <asp:LinkButton id="btn_ForgotPW_M" runat="server" target="_top" PostBackUrl="ForgotPW.aspx" href="ForgotPW.aspx" style="margin-left:-122px;margin-right:-42px;">I forgot my password</asp:LinkButton>
</td> </td>
</tr> </tr>
<tr style="color:#003680; height:12px"> <tr style="color:#003680; height:12px">