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

---
 Web.config               | 105 ++++++++++++++++++++++++---------------
 login/Loggedin.aspx      |   2 +-
 login/login_FLEX.aspx    |  23 +++++++--
 login/login_FLEX.aspx.vb |   2 +
 4 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/Web.config b/Web.config
index e22a1c9..0f2eb36 100644
--- a/Web.config
+++ b/Web.config
@@ -25,17 +25,17 @@
   -->
   <system.web>
     <authentication mode="Forms">
-      <forms defaultUrl="admin/admin.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880" />
+      <forms defaultUrl="admin/admin.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880"/>
     </authentication>
-    <sessionState mode="InProc" timeout="2880" cookieless="UseCookies" regenerateExpiredSessionId="true" compressionEnabled="false" />
-    <httpRuntime requestValidationMode="2.0" targetFramework="4.7" />
+    <sessionState mode="InProc" timeout="2880" cookieless="UseCookies" regenerateExpiredSessionId="true" compressionEnabled="false"/>
+    <httpRuntime requestValidationMode="2.0" targetFramework="4.7"/>
 	  
-    <pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" />
+    <pages validateRequest="false" controlRenderingCompatibilityVersion="4.0"/>
     <!--<securityPolicy>
       <trustLevel name="Full" policyFile="internal"/>
     </securityPolicy>-->
-    <customErrors mode="Off" />
-    <compilation strict="false" explicit="true" targetFramework="4.7" debug="true">
+    <customErrors mode="Off"/>
+    <compilation strict="false" explicit="true" targetFramework="4.7">
       <!-- <assemblies>
         <add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/>
       </assemblies>
@@ -50,77 +50,100 @@
         <add assembly="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
         <add assembly="MySql.Data.Entity, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
     <add assembly="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30AD4FE6B2A6AEED" /> -->
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+        <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
       </assemblies>
     </compilation>
     <membership defaultProvider="MySqlMembershipProvider">
       <providers>
-        <clear />
-        <add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d" autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/" />
+        <clear/>
+        <add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d"
+          autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true"
+          requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6"
+          minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/"/>
       </providers>
     </membership>
   </system.web>
   <connectionStrings>
-    <add name="MyProviderDbConn" connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306" providerName="MySqlMembershipProvider" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString" connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString" connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
-    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" providerName="" />
+    <add name="MyProviderDbConn"
+      connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306"
+      providerName="MySqlMembershipProvider"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString"
+      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString"
+      connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString"
+      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString"
+      connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString"
+      connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"
+      providerName=""/>
   </connectionStrings>
   <system.webServer>
     <rewrite>
       <rules>
         <rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true">
-          <match url="(.*)" />
+          <match url="(.*)"/>
           <conditions>
-            <add input="{HTTPS}" pattern="off" />
+            <add input="{HTTPS}" pattern="off"/>
           </conditions>
-          <action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}" />
+          <action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}"/>
         </rule>
       </rules>
     </rewrite>
   </system.webServer>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <remove invariant="MySql.Data.MySqlClient"/>
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL"
+        type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
     </DbProviderFactories>
   </system.data>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046" />
+        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
 	<appSettings>
-		<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
+		<add key="ValidationSettings:UnobtrusiveValidationMode" value="None"/>
 		<add key="ClientValidationEnabled" value="true"/>
 		<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
 	</appSettings>
diff --git a/login/Loggedin.aspx b/login/Loggedin.aspx
index 8531fae..d2dd833 100644
--- a/login/Loggedin.aspx
+++ b/login/Loggedin.aspx
@@ -59,7 +59,7 @@
            <h2> Willkommen zurück!</h2> <asp:LoginName ID="LoginName1" runat="server" />
         <div class="row" id="BTN_World">
             <div class="col-3">
-            <asp:LinkButton ID="LogoutButton" target="_top" href="../login/Logout.aspx" runat="server" CssClass="btn btn-primary" Text="Logout" />
+            <asp:LinkButton ID="LogoutButton" target="_parent" href="../login/Logout.aspx" PostBackUrl="../newpageJulius_Sidebar.aspx" runat="server" CssClass="btn btn-primary" Text="Logout" />
                 </div>
             <div style="height:/*15px*/1.17096018735363vh;"></div>
             <div class="col-3">
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 77ae15a..985dd85 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -131,10 +131,10 @@
                                     </tr>
                                     <tr>
                                         <td align="left" colspan="2">
-                                           <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" href="../newpageJulius_Sidebar.aspx"/>
+                                           <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login"  ValidationGroup="Login1" Text="Login" PostBackUrl="~/newpageJulius_Sidebar.aspx" />
                                         </td>
                                          <td align="middle" colspan="2">                                  
-                                       <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2">Admin-Login</asp:LinkButton>
+                                       <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
                                    </td>
                                     </tr>
                                 </table>            
@@ -145,6 +145,20 @@
           
      <script type="text/javascript">
            function bust2() {
+               if (top.location == self) {
+                   var zipphone2_1 = getElementById("#CustomerID").val();
+                   var  zipphone2_2 = getElementById("#UserName").val();
+                   var zipphone2_3 = getElementById("#Password").val();
+                   alert("send:" + zipphone2_1)
+                   alert("send:" + zipphone2_2)
+                   alert("send:" + zipphone2_3)
+                   //parent.location.replace('../Customers/Welcome.aspx');
+                   top.location = '../Customers/Welcome.aspx';
+               }
+           }
+       </script>
+     <script type="text/javascript">
+     function bust1() {
                if (top.location != self) {
                    var zipphone2_1 = getElementById("#CustomerID").val();
                    var  zipphone2_2 = getElementById("#UserName").val();
@@ -153,11 +167,10 @@
                    alert("send:" + zipphone2_2)
                    alert("send:" + zipphone2_3)
                    //parent.location.replace('../Customers/Welcome.aspx');
-                   top.location.replace('../Customers/Welcome.aspx');
+                   top.location = '../newpageJulius_Sidebar.aspx';
                }
            }
-       </script>
-     
+     </script>
     </body>    
 </html>
 
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 9e4d7a8..0f50b92 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -57,4 +57,6 @@ Partial Class login_login_TEST
         End Using
     End Sub
 
+
+
 End Class