From f32861cf9302df81c4124d969212015cf955883c Mon Sep 17 00:00:00 2001 From: ja Date: Wed, 13 Oct 2021 11:17:35 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20CSS=20und=20Design?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/RegexSammlung_VERAG.vb | 20 ++++---------------- css/login/ForgotPW.css | 22 +++++++++++++++++----- css/login/loginFLEX.css | 13 ++++++------- login/ChangePW.aspx | 8 +++----- login/ChangePW.aspx.vb | 3 ++- login/ForgotPW.aspx | 15 ++++++--------- login/ForgotPW.aspx.vb | 33 +++++++++++++++++++++------------ login/login_FLEX.aspx | 27 ++++++++++++--------------- login/login_FLEX_iFrame.aspx | 1 + 9 files changed, 72 insertions(+), 70 deletions(-) diff --git a/App_Code/RegexSammlung_VERAG.vb b/App_Code/RegexSammlung_VERAG.vb index a2e8a94..b4df790 100644 --- a/App_Code/RegexSammlung_VERAG.vb +++ b/App_Code/RegexSammlung_VERAG.vb @@ -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 diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css index 34f757e..2572850 100644 --- a/css/login/ForgotPW.css +++ b/css/login/ForgotPW.css @@ -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; diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css index c28b988..0689445 100644 --- a/css/login/loginFLEX.css +++ b/css/login/loginFLEX.css @@ -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; diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx index 31d75ef..4edde46 100644 --- a/login/ChangePW.aspx +++ b/login/ChangePW.aspx @@ -94,11 +94,9 @@ - - <% Dim veragregex = New RegexSammlung_VERAG() - Dim veragpwVAL = veragregex.getregPassword()%> + - + @@ -113,7 +111,7 @@ - + diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb index e0a208f..0040047 100644 --- a/login/ChangePW.aspx.vb +++ b/login/ChangePW.aspx.vb @@ -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 diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 682d5b6..182eddb 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -73,11 +73,7 @@ - <%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()%> +
@@ -85,7 +81,7 @@ @@ -107,12 +103,13 @@ + + +
- +
- +
- -
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 1451b32..d48dde9 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -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},

Bitte dem Link zum Zurücksetzen des Passwortes folgen:


.
" + Environment.NewLine + "Link" + Environment.NewLine + "
Mit freundlichen Grüßen,", username, password) + mailto = email + Betreff = "Passwort reset" + htmlbody = String.Format("Sehr geehrte/r {0},

Bitte dem Link zum Zurücksetzen des Passwortes folgen:


.
" + Environment.NewLine + "Link" + Environment.NewLine + "
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},

Bitte dem Link zum Zurücksetzen des Passwortes folgen:


.
" + Environment.NewLine + "Link" + Environment.NewLine + "
Mit freundlichen Grüßen,", username, password) + mailto = email + Betreff = "Passwort reset" + htmlbody = String.Format("Sehr geehrte/r {0},

Bitte dem Link zum Zurücksetzen des Passwortes folgen:


.
" + Environment.NewLine + "Link" + Environment.NewLine + "
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 diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index 16d7558..0c021af 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -110,9 +110,7 @@ } - <%Dim veragregex = New RegexSammlung_VERAG() - Dim regexUID As String = veragregex.getregUID() - Dim regexPWVal As String = veragregex.getregPassword()%> +
@@ -123,27 +121,28 @@ + + @@ -153,21 +152,19 @@ + - - - - +
- +
- +
-
- +
- + + + I forgot my password! +
- - I forgot my password! -
diff --git a/login/login_FLEX_iFrame.aspx b/login/login_FLEX_iFrame.aspx index 6c470d1..73054d7 100644 --- a/login/login_FLEX_iFrame.aspx +++ b/login/login_FLEX_iFrame.aspx @@ -85,6 +85,7 @@
* +