diff --git a/login/ChangePW.aspx b/login/Change_PW.aspx similarity index 79% rename from login/ChangePW.aspx rename to login/Change_PW.aspx index b5d907d..fe614fb 100644 --- a/login/ChangePW.aspx +++ b/login/Change_PW.aspx @@ -1,16 +1,15 @@ -<%@ Page Language="VB" AutoEventWireup="false" CodeFile="ChangePW.aspx.vb" Inherits="ChangePW" %> +<%@ Page Language="VB" AutoEventWireup="false" CodeFile="Change_PW.aspx.vb" Inherits="login_Change_PW" %> - - <%@ import Namespace="MySql.Data.MySqlClient"%> - - + + + - + @@ -35,6 +34,8 @@ document.getElementById("UserID").focus(); } + <%@ import Namespace="MySql.Data.MySqlClient"%> + - - - - - - - - - - - - + +
-
+
- +
- - - - - - - - - +
- -
- - - -
+ + + + + + + @@ -198,7 +177,12 @@ -
+ +
+ + + +
+ + + + + +
@@ -244,30 +228,14 @@ - +
-
+
-
-
- - - - + + - diff --git a/login/ChangePW.aspx.vb b/login/Change_PW.aspx.vb similarity index 99% rename from login/ChangePW.aspx.vb rename to login/Change_PW.aspx.vb index cb1d295..544d4b1 100644 --- a/login/ChangePW.aspx.vb +++ b/login/Change_PW.aspx.vb @@ -1,7 +1,7 @@ -Imports System.Data.SqlClient -Imports System.Data + +Imports System.Data.SqlClient -Partial Class ChangePW +Partial Class login_Change_PW Inherits System.Web.UI.Page Protected Sub Page_Load(sender As Object, e As EventArgs) @@ -203,4 +203,4 @@ Partial Class ChangePW Protected Sub Image1_M_Click(sender As Object, e As ImageClickEventArgs) MsgBox("") End Sub -End Class +End Class \ No newline at end of file diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index beb1af5..5deddce 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -526,7 +526,7 @@ Partial Class ForgotPW Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich." Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially" Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding." - htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag |" + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) + htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag |" + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME") MsgBox(getdomianenvironment) @@ -538,7 +538,7 @@ Partial Class ForgotPW Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich." Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially" Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding." - htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + tokenname + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag | " + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) + htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + tokenname + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag | " + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then 'MsgBox("Error09:" + Environment.NewLine + "The Domain could not be vaildated. Check Link please or contact the Administrator of the program.") lblMessage.ForeColor = Color.OrangeRed diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 9afe316..2b57d1e 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -87,7 +87,7 @@ Partial Class login_FLEX reqfieldvaluserName.ErrorMessage = "Username has to be given." End If End If - If String.IsNullOrEmpty(tb2.Text) = False AndAlso String.IsNullOrEmpty(tb2_M.Text) = True Then + If String.IsNullOrEmpty(tb2_M.Text) = False AndAlso String.IsNullOrEmpty(tb2.Text) = True Then reqfieldvaluserName.Enabled = False reqfieldvaluserName_M.Enabled = True reqfieldvaluserName_M.Validate() @@ -108,15 +108,22 @@ Partial Class login_FLEX End If passw = tb3.Text End If + If String.IsNullOrEmpty(tb3.Text) = False AndAlso String.IsNullOrEmpty(tb3_M.Text) = True Then + reqfieldvalpassw.Enabled = True + reqfieldvalpassw_M.Enabled = False + + reqfieldvalpassw.Validate() + If reqfieldvalpassw.IsValid = True Then + End If + passw = tb3_M.Text + End If End If - If reqfieldvalpassw_M.IsValid AndAlso String.IsNullOrEmpty(tb3.Text) = False AndAlso String.IsNullOrEmpty(tb3_M.Text) = True Then + If String.IsNullOrEmpty(tb3.Text) = False AndAlso String.IsNullOrEmpty(tb3_M.Text) = True Then reqfieldvalpassw.Enabled = False reqfieldvalpassw_M.Enabled = True reqfieldvalpassw_M.Validate() If reqfieldvalpassw_M.IsValid = True Then passw = tb3_M.Text - Else - reqfieldvalpassw_M.ErrorMessage = "Password has to be given." End If End If ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString