From 71cdc644a32d60d566dad6d66e092c6ce9c02a75 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 13 Oct 2021 16:14:00 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master  | 45 ++++++++++++++++++++++++++++++++-----
 Customers/CustomsAviso.aspx |  3 +--
 login/ForgotPW.aspx         |  2 +-
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 6429895..ba652bf 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -23,7 +23,8 @@
     <script src="//code.jquery.com/jquery-1.11.3.min.js"></script>       
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   
-     <%@ import Namespace="MySql.Data.MySqlClient" %>
+     <%@ import Namespace="MySql.Data.MySqlClient"%>
+    <%@import Namespace="System.Data.SqlClient" %>
     <script runat="server">
         Sub Page_Load() Handles Me.Load
             'Login-Validierung
@@ -192,6 +193,38 @@
                                                                                   ElseIf laenderkuerzel = "TR" And lan3 = "0" Then
                                                                                       flagpath = "images/flags/flagge_TR.gif"
                                                                                   End If
+                                                                                  Dim Connectionstring As String = String.Empty
+                                                                                  Dim username As String = Me.Page.User.Identity.Name
+                                                                                  Dim lastloggedin As String = String.Empty
+                                                                                  Dim createdUserDate As String = String.Empty
+                                                                                  Dim emailuser As String = String.Empty
+
+                                                                                  If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
+                                                                                      '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
+                                                                                      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
+                                                                                  ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString
+                                                                                  Using con As New SqlConnection(ConnectionString)
+                                                                                      ' Using cmd As New SqlCommand("Validate_User")
+                                                                                      Using cmd As New SqlCommand("SELECT Username,Email,LastLoginDate,CreatedDate FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username")
+                                                                                          ' cmd.CommandType = CommandType.StoredProcedure
+                                                                                          cmd.Parameters.AddWithValue("@Username", username)
+                                                                                          cmd.Connection = con
+                                                                                          con.Open()
+                                                                                          'userId = Convert.ToInt32(cmd.ExecuteScalar())
+                                                                                          Dim dr As SqlDataReader = cmd.ExecuteReader()
+                                                                                          If dr.Read() Then
+                                                                                              username = dr("Username").ToString()
+                                                                                              lastloggedin = dr("LastLoginDate").ToString()
+                                                                                              createdUserDate = dr("CreatedDate").ToString()
+                                                                                              emailuser = dr("Email").ToString()
+                                                                                          End If
+                                                                                      End Using
+                                                                                      con.Close()
+                                                                                  End Using
 
                                                                                   %>          
    <li class="wrapper">
@@ -305,7 +338,9 @@
                                     <div class="col-sm-5">
                                         <ul style="list-style:unset;border:2.3px ridge #043381;text-align:start">
                                              <li> Name: <%=Me.Page.User.Identity.Name %></li>
-                                             <li> Registriert seit: 15/02/2021</li>
+                                             <li> Registriert seit: <%=createdUserDate %></li>
+                                             <li> Email: <%=emailuser %></li>
+                                             <li>letzter Login: <%=lastloggedin %></li>
                                              <li> Die Berechtigungen im Überblick:</li>
                                         <ul>
                                        
@@ -371,7 +406,7 @@
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SRB"><img src="<%'= imgPath%>images/flags/flagge_BIH.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />BIH</a>-->
-                                                                 <a id="ButtonSerbischLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "SRB" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strBIHLang %></a>
+                                                                 <a id="ButtonSerbischLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "DE" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strBIHLang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SM"><img src="<'%= imgPath%>images/flags/flagge_SM.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />SRB</a>-->
@@ -383,7 +418,7 @@
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm"  href="<%'= navParent%>&lan=TR"><img src="<%'= imgPath%>images/flags/flagge_TR.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/>TR</a>-->
-                                                                 <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>?lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "TR" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strTRlang%></a>                                                                                                                                                                                                                                                                                                                                                             
+                                                                 <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>?lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "EN" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang%></a>                                                                                                                                                                                                                                                                                                                                                             
                                                              </li>
                                                           </ul>
                                                      </div>
@@ -483,7 +518,7 @@
                                                   <a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=EN&lan3=0" style="color:#043381;background-color:#fff;border:hidden;width:155px"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=stringEN%></a>
                                                   <a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=0" style="color:#043381;background-color:#fff;border:hidden;width:155px"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=stringBIH%></a> 
                                                   <a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=1" style="color:#043381;background-color:#fff;border:hidden;width:155px"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=stringSRB%></a> 
-                                                  <a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=BG&lan3=0" style="color:#043381;background-color:#fff;border:hidden;width:155px"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=stringBG%></a>                                             
+                                                  <a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=BG&lan3=0" style="color:#043381;background-color:#fff;border:hidden;width:155px"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=strSRBlang %></a>                                             
                                               </div>
                                 </div>                            
                    </nav></div>   
diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 0904c8c..5b6f0a4 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -21,8 +21,7 @@
     <link rel="stylesheet" type="text/css" href="../css/main.css"/>
     <link rel="stylesheet" type="text/css" href="../css/style.css"/>
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-    <link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>
-   
+    <link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>   
     <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>       
     <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>      
     <link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/>      
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 1d70cdc..a0d4848 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -109,7 +109,7 @@
                 <tr style="color:#003680; height:30px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Text="Username" Font-Size="1.125em" Width="250px" style="margin-left:22px;color:#003680" OnClick="this.value='';" />
-                    <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1]{4,30})$"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
                      </td></tr>
                 <tr style="color:#003680; height:30px;">
                 <td align="right" colspan="2">