Merge branch 'develop'

2022-09-13 09:18:54 +02:00
parent 69655ad831 75c227e4b7
commit 65c345d2fb
6 changed files with 73 additions and 1 deletions
@@ -521,6 +521,7 @@
    <Content Include="images\favicon.png" />
    <Content Include="Informazioni.aspx" />
    <Content Include="jumper.aspx" />
+    <Content Include="logout.aspx" />
    <Content Include="logs\PlaceHolder.file" />
    <Content Include="Properties\PublishProfiles\IIS03.pubxml.user" />
    <Content Include="Scripts\bootstrap.bundle.js" />
@@ -813,6 +814,13 @@
    <Compile Include="jumper.aspx.designer.cs">
      <DependentUpon>jumper.aspx</DependentUpon>
    </Compile>
+    <Compile Include="logout.aspx.cs">
+      <DependentUpon>logout.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="logout.aspx.designer.cs">
+      <DependentUpon>logout.aspx</DependentUpon>
+    </Compile>
    <Compile Include="MancateTimbrature.aspx.cs">
      <DependentUpon>MancateTimbrature.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -62,6 +62,11 @@ namespace GPW.WebUserControls
                    memLayer.ML.setSessionVal("cognomeNome", CognomeNome);
                    Response.Redirect("Timbrature.aspx");
                }
+                else
+                {
+                    // forzo logout
+                    Response.Redirect("logout.aspx");
+                }
            }
        }

@@ -38,7 +38,7 @@ namespace GPW.WebUserControls
            {
                idxDipendente = Convert.ToInt32(ddlIdxDipendente.SelectedValue);
                dipendente = DataProxy.DP.getRowDip(idxDipendente);
-                UserAuthKey = dipendente.authKey;
+                UserAuthKey = HttpUtility.UrlEncode(dipendente.authKey);
                destinatario = dipendente.email;
            }
            catch
@@ -0,0 +1,15 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="logout.aspx.cs" Inherits="GPW_Smart.logout" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace GPW_Smart
+{
+    public partial class logout : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            Session.Clear();
+            Response.Redirect("regNewDevice");
+        }
+    }
+}
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GPW_Smart
+{
+
+
+    public partial class logout
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}