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

Änderungen an Codefiles Der alte alle Elemente würden fehlen Fehler tritt nun nicht mehr auf.

Browse Source
This commit is contained in:
ja
2021-10-15 15:14:37 +02:00
parent 2c4bb14cad
commit b94c5bfae3
15 changed files with 188 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Customers/CustomsAviso.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso_Default" UnobtrusiveValidationMode="None"%>
<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<!-- Bootstrap -->

2
Customers/CustomsAviso.aspx.vb
View File

@@ -2,7 +2,7 @@
Imports System.Data
Imports System.Web.UI.HtmlControls
Partial Class CustomsAviso_Default
Partial Class CustomsAviso
Inherits System.Web.UI.Page
Dim datevon As DateTime
Dim datebis As DateTime

2
Customers/LKWs.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="Customers_Default" %>
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="LKWS" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<!-- Bootstrap -->

2
Customers/LKWs.aspx.vb
View File

@@ -1,5 +1,5 @@

Partial Class Customers_Default
Partial Class LKWS
Inherits System.Web.UI.Page
End Class

2
Customers/Welcome.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Title="Welcome VERAG SPEDITION AG " Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Welcome.aspx.vb" Inherits="Customers_Default" %>
<%@ Page Title="Welcome VERAG SPEDITION AG " Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Welcome.aspx.vb" Inherits="Welcome" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<!-- Bootstrap -->

2
Customers/Welcome.aspx.vb
View File

@@ -1,5 +1,5 @@

Partial Class Customers_Default
Partial Class Welcome
Inherits System.Web.UI.Page
End Class

7
login/ForgotPW.aspx
View File

@@ -239,6 +239,11 @@
window.history.back()
}
</script>
<script runat="server">
Sub Page_Load() Handles Me.Load
End Sub
</script>
<style>
</style>
@@ -257,7 +262,7 @@
<asp:Button ID="btn_Back" runat="server" Width="265" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" OnClick="btn_Back_Click" style="margin-left:49px;"/>
</td>
</tr>
<tr style="color:#003680; height:32px;font-size:12px">
<tr style="color:#003680; height:32px;font-size:14px">
<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:82px;font-size:17px;"></asp:Label>
</td></tr>

22
login/ForgotPW.aspx.vb
View File

@@ -7,17 +7,19 @@ Imports System.Data
Partial Class login_ForgotPW
Inherits System.Web.UI.Page
Dim ConnectionString As String = String.Empty
Protected Sub btn_Back_Click(sender As Object, e As EventArgs)
Response.Redirect("login/login_FLEX.aspx")
End Sub
Protected Sub btn_Send_Click(sender As Object, e As EventArgs)
Dim username As String = String.Empty
Dim password As String = String.Empty
Dim email As String = String.Empty
Dim tokenname As String = String.Empty
If txtEmail.Text = String.Empty And txt_Username_M.Text = String.Empty Then
If txtEmail_M.Text = String.Empty And txt_Username_M.Text = String.Empty AndAlso String.IsNullOrWhiteSpace(txtEmail.Text) = False AndAlso String.IsNullOrWhiteSpace(txt_Username.Text) = False Then
valreqtxtEmail_M.Enabled = False
valreqtxtEmail.Enabled = True
regexval_txt_Email_2.Enabled = True
@@ -27,7 +29,7 @@ Partial Class login_ForgotPW
check_UserName_regex.Validate()
If valreqtxtEmail.IsValid = True AndAlso check_UserName_regex.IsValid = True Then
email = txtEmail.Text
username = txt_Username_M.Text
username = txt_Username.Text
ElseIf valreqtxtEmail.IsValid = False Then
valreqtxtEmail.ErrorMessage = "Annotation: The given Domain is not the company domain."
regexval_txt_Email.Validate()
@@ -38,7 +40,8 @@ Partial Class login_ForgotPW
check_UserName_regex.IsValid = True
End If
End If
Else
'Mobil
ElseIf txtEmail.Text = String.Empty And txt_Username.Text = String.Empty AndAlso String.IsNullOrWhiteSpace(txtEmail_M.Text) = False AndAlso String.IsNullOrWhiteSpace(txt_Username_M.Text) = False Then
valreqtxtEmail_M.Enabled = True
regexval_txt_Email.Enabled = False
regexval_txt_Email_2.Enabled = False
@@ -58,13 +61,15 @@ Partial Class login_ForgotPW
check_UserName_regex_M.IsValid = True
End If
End If
End If
If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True AndAlso String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then
Dim ConnectionString = String.Empty
If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True And String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
Else
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
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;"
End If
@@ -102,14 +107,14 @@ Partial Class login_ForgotPW
check_UserName_regex.ErrorMessage = "No valid Username found in out database!"
check_UserName_regex.IsValid = False
End If
If (txtEmail.Text = dr("Email").ToString() And txtEmail_M.Text = String.Empty) Then
If (txtEmail.Text = dr("Email").ToString() And String.IsNullOrEmpty(txtEmail_M.Text)) = True Then
regexval_txt_Email_M.Enabled = False
regexval_txt_Email.Enabled = True
regexval_txt_Email.Validate()
email = txtEmail.Text
lblMessage.ForeColor = Color.Green
lblMessage.Text = "The given e-mail exists in our database."
ElseIf (txtEmail_M.Text = dr("Email").ToString() And txtEmail.Text = String.Empty) Then
ElseIf (txtEmail_M.Text = dr("Email").ToString() And String.IsNullOrEmpty(txtEmail.Text) = True) Then
regexval_txt_Email_M.Validate()
email = txtEmail_M.Text
lblMessage_M.ForeColor = Color.Green
@@ -183,6 +188,7 @@ Partial Class login_ForgotPW
lblMessage.ForeColor = Color.Red
lblMessage.Text = "The form has not been filled completeley."
End If
End If
End Sub
'Function RandomString(r As Random, max As Integer) As String

57
login/login_FLEX.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX.aspx.vb" Inherits="login_login_TEST"%>
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX.aspx.vb" Inherits="login_FLEX"%>
<!DOCTYPE html>
@@ -120,7 +120,7 @@
.container-fluid {
width: 400px;
height: 713px;
height: 613px;
background-color: rgba(255,255,255,0.5);
top:50%;
bottom: auto;
@@ -133,7 +133,7 @@
font-size: 11px;
border: 1px solid gray;
width: 300px;
height: 713px;
height: 613px;
}
#lbl_Ueberschrift_M {
background-color: #003680;
@@ -144,6 +144,7 @@
background-color: #003680;
font-size: 2em;
color: #fff;
margin-top:-20px;
}
.txt_design {
color: #003680;
@@ -168,6 +169,7 @@
#Password_M {
margin-right: -20px;
margin-top:-20px;
}
#UserName_M {
@@ -222,7 +224,17 @@
#Login1_btn_ForgotPW_M{
font-size:17px;
margin-top:80px;
}
#tblrowbuttons{
height:40px;
}
#lbl_for_chkbox{
font-size:18px;
margin-left:8px;
color:#003680;
}
}
</style>
<!-- <script type="text/javascript" src="../js/toptions/top_up-min.js"></script> -->
@@ -271,9 +283,9 @@
</tr>
<tr style="color:#003680; height:46px;">
<td align="left">
<asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged" Width="320" Text="User-ID / E-Mail" OnClick="this.value='';" style="margin-left: 22px" Font-Size="1.25em"></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="[0-9]{4,10}"></asp:RegularExpressionValidator>
<asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged" Width="320" Text="User-ID" style="margin-left: 22px" Font-Size="1.25em"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="false" 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="false" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
@@ -295,7 +307,7 @@
<asp:Button ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="330px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<tr id="tblrowbuttons" style="color:#003680; height:23px;">
<td align="left" colspan="2">
<asp:CheckBox ID="RememberMe" runat="server" Text="Remember me." style="margin-left:22px;" />
</td>
@@ -317,45 +329,46 @@
<table id="tbl_main_M" cellpadding="0" style="margin: 4px 0px 4px 4px;border:none">
<tr style="color:#003680; height:30px;">
<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"></asp:Label>
<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>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<tr style="color:#003680; height:86px">
<td align="left">
<asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" OnTextChanged="CustomerID_TextChanged" Width="325" Text="User-ID / E-Mail" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="CustomerID_M" SetFocusOnError="true" ValidationGroup="txt_checkUID_M" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="CustomerID_M" ValidationGroup="txt_checkUID_M" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
<asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" OnTextChanged="CustomerID_TextChanged" Width="325" Text="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="CustomerID_M" SetFocusOnError="false" ValidationGroup="txt_checkUID_M" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="CustomerID_M" ValidationGroup="txt_checkUID_M" runat="server" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<tr style="color:#003680; height:86px;">
<td align="left" colspan="2">
<asp:TextBox ID="UserName_M" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325" ValidationGroup="txt_Username" required="true" Font-Size="2.025em" style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Username"></asp:TextBox>
<asp:TextBox id="UserName_M" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325" ValidationGroup="txt_Username" Placeholder="Username" required="true" Font-Size="2.025em" style="margin-left:22px;color:#003680" OnTextChanged="Username_M_TextChanged" OnClick="this.value='';" Text="Username"></asp:TextBox>
<asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="UserName_M" ErrorMessage="Please enter the Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="UserName_M" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z]{4,30})$"></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<tr style="color:#003680; height:86px;">
<td align="left" colspan="2">
<asp:TextBox ID="Password_M" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "325" Font-Size="2.025em" 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_M" runat="server" ControlToValidate="Password_M" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="checkpwd_M_REGEX" ControlToValidate="Password_M" ValidationGroup="chk_PWField_M" 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;">
<tr style="color:#003680; height:143px;">
<td align="left" colspan="2">
<asp:Button ID="LoginButton_M" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="330px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<tr style="color:#003680; height:46px;">
<td align="left" colspan="2">
<asp:CheckBox ID="RememberMe_M" runat="server" Text="Remember me." Font-Size="17px" style="margin-left:22px;" />
<asp:CheckBox ID="RememberMe_M" runat="server" style="margin-left:22px;"/><label for="RememberMe_M" id="lbl_for_chkbox">Remember me.</label>
</td>
<td align="right" colspan="4">
<a ID="btn_ForgotPW_M" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-164px;margin-right:-62px"> I forgot my password!</a>
<td align="right" colspan="2">
<a id="btn_ForgotPW_M" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-164px;margin-right:-62px;"> I forgot my password!</a>
</td>
</tr>
<tr style="color:#003680; height:23px">
<tr style="color:#003680; height:fit-content">
<td align="center" style="color:Red;" colspan="2">
<asp:Literal ID="FailureText_M" runat="server" EnableViewState="False"></asp:Literal>
</td>

17
login/login_FLEX.aspx.vb
View File

@@ -1,11 +1,13 @@
Imports System.Data.SqlClient
Imports System.Data
Partial Class login_login_TEST
Partial Class login_FLEX
Inherits System.Web.UI.Page
Dim CustomerIDTextBox As TextBox
Protected Sub Page_Load(sender As Object, e As EventArgs)
Protected Sub Page_Load(sender As Object, e As EventArgs)
If Not Page.IsPostBack Then
End If
End Sub
Protected Sub ValidateUser(sender As Object, e As EventArgs)
Dim userId As Integer = 0
@@ -43,8 +45,7 @@ Partial Class login_login_TEST
Case Else
Login1.FailureText = "Erfolgreich validiert."
Session.Add("test", Login1.UserName)
CustomerIDTextBox = Login1.FindControl("CustomerID")
Session.Add("CustomerID", CustomerIDTextBox.Text)
Session.Add("PW", Login1.Password)
FormsAuthentication.RedirectFromLoginPage(Login1.UserName, True)
@@ -65,7 +66,11 @@ Partial Class login_login_TEST
End Sub
Protected Sub CustomerID_TextChanged(sender As Object, e As EventArgs)
' valid_getNumberInput.Validate()
End Sub
Protected Sub Username_M_TextChanged(sender As TextBox, e As EventArgs)
If sender.Text = "" Then
sender.Text = "ID"
End If
End Sub
End Class

2
login/login_FLEX_iFrame.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX_iFrame.aspx.vb" Inherits="login_login_TEST"%>
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX_iFrame.aspx.vb" Inherits="login_login_IFRAME"%>
<!DOCTYPE html>

2
login/login_FLEX_iFrame.aspx.vb
View File

@@ -1,7 +1,7 @@
Imports System.Data.SqlClient
Imports System.Data
Partial Class login_login_TEST
Partial Class login_login_IFRAME
Inherits System.Web.UI.Page
Dim CustomerIDTextBox As TextBox
Protected Sub ValidateUser(sender As Object, e As EventArgs)

2
login/login_TEST.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_TEST.aspx.vb" Inherits="login_login_TEST" %>
<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_TEST.aspx.vb" Inherits="login_TEST" %>
<!DOCTYPE html>

2
login/login_TEST.aspx.vb
View File

@@ -1,7 +1,7 @@
Imports System.Data.SqlClient
Imports System.Data
Partial Class login_login_TEST
Partial Class login_TEST
Inherits System.Web.UI.Page
Protected Sub ValidateUser(sender As Object, e As EventArgs)