diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 70f0053..72f5b0a 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -521,6 +521,7 @@ + @@ -813,6 +814,13 @@ jumper.aspx + + logout.aspx + ASPXCodeBehind + + + logout.aspx + MancateTimbrature.aspx ASPXCodeBehind diff --git a/GPW_Smart/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs b/GPW_Smart/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs index 12fd314..142f6bd 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs @@ -62,6 +62,11 @@ namespace GPW.WebUserControls memLayer.ML.setSessionVal("cognomeNome", CognomeNome); Response.Redirect("Timbrature.aspx"); } + else + { + // forzo logout + Response.Redirect("logout.aspx"); + } } } diff --git a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs index 26db584..445edd4 100644 --- a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs @@ -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 diff --git a/GPW_Smart/logout.aspx b/GPW_Smart/logout.aspx new file mode 100644 index 0000000..6ea0b82 --- /dev/null +++ b/GPW_Smart/logout.aspx @@ -0,0 +1,15 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="logout.aspx.cs" Inherits="GPW_Smart.logout" %> + + + + + + + + +
+
+
+
+ + diff --git a/GPW_Smart/logout.aspx.cs b/GPW_Smart/logout.aspx.cs new file mode 100644 index 0000000..7ae2c2e --- /dev/null +++ b/GPW_Smart/logout.aspx.cs @@ -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"); + } + } +} \ No newline at end of file diff --git a/GPW_Smart/logout.aspx.designer.cs b/GPW_Smart/logout.aspx.designer.cs new file mode 100644 index 0000000..58f5101 --- /dev/null +++ b/GPW_Smart/logout.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GPW_Smart +{ + + + public partial class logout + { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +}