diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index 041198a..939111d 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -311,7 +311,7 @@ - I forgot my password + I forgot my password diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 6f12da7..cba3555 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -41,30 +41,82 @@ Partial Class login_FLEX Dim UserNaMe As String = String.Empty Dim passw As String = String.Empty - If reqfieldvaluserID.IsValid Then - regexuserID.Validate() - If regexuserID.IsValid Then - Customer_ID = tb.Text - End If - ElseIf reqfieldvaluserID_M.IsValid Then - regexusername_M.Validate() - If regexusername_M.IsValid Then - Customer_ID = tb_M.Text + If String.IsNullOrEmpty(tb.Text) = False AndAlso String.IsNullOrEmpty(tb_M.Text) = True Then + reqfieldvaluserID.Enabled = True + reqfieldvaluserID_M.Enabled = False + reqfieldvaluserID.Validate() + If reqfieldvaluserID.IsValid = True Then + regexuserID.Validate() + If regexuserID.IsValid Then + Customer_ID = tb.Text + Else + regexuserID.ErrorMessage = "" + End If + Else + reqfieldvaluserID.ErrorMessage = "" End If End If - - If reqfieldvaluserName.IsValid Then - UserNaMe = tb2.Text - ElseIf reqfieldvaluserName_M.IsValid Then - UserNaMe = tb2_M.Text + If String.IsNullOrEmpty(tb_M.Text) = False AndAlso String.IsNullOrEmpty(tb.Text) = True Then + reqfieldvaluserID.Enabled = False + reqfieldvaluserID_M.Enabled = True + If reqfieldvaluserID_M.IsValid = True Then + regexusername_M.Validate() + If regexusername_M.IsValid Then + Customer_ID = tb_M.Text + Else + regexusername_M.ErrorMessage = "" + End If + Else + reqfieldvaluserID_M.ErrorMessage = "" + End If End If - - If reqfieldvalpassw.IsValid Then - passw = tb3.Text - ElseIf reqfieldvaluserName_M.IsValid Then - passw = tb2_M.Text + If String.IsNullOrEmpty(tb2.Text) = False AndAlso String.IsNullOrEmpty(tb2_M.Text) = True Then + reqfieldvaluserName.Enabled = True + reqfieldvaluserName_M.Enabled = False + regexusername.Validate() + If reqfieldvaluserName.IsValid = True Then + If regexusername.IsValid Then + UserNaMe = tb2.Text + Else + regexusername_M.ErrorMessage = "" + End If + Else + reqfieldvaluserName.ErrorMessage = "" + End If + End If + If String.IsNullOrEmpty(tb2.Text) = False AndAlso String.IsNullOrEmpty(tb2_M.Text) = True Then + reqfieldvaluserName.Enabled = False + reqfieldvaluserName_M.Enabled = True + reqfieldvaluserName_M.Validate() + If reqfieldvaluserName_M.IsValid = True Then + regexusername_M.Validate() + If regexusername.IsValid Then + UserNaMe = tb2_M.Text + Else + regexusername.ErrorMessage = "" + End If + Else + reqfieldvaluserName_M.ErrorMessage = "" + End If + If reqfieldvalpassw.IsValid AndAlso String.IsNullOrEmpty(tb3_M.Text) = False AndAlso String.IsNullOrEmpty(tb3.Text) = True Then + reqfieldvalpassw.Enabled = True + reqfieldvalpassw_M.Enabled = False + reqfieldvalpassw.Validate() + If reqfieldvalpassw.IsValid = True Then + End If + passw = tb3.Text + End If + End If + If reqfieldvalpassw_M.IsValid AndAlso 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 = "" + End If End If - ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString Using con As New SqlConnection(ConnectionString) ' Using cmd As New SqlCommand("Validate_User")