diff --git a/C-TRACK/WebUserControls/mod_footer.ascx b/C-TRACK/WebUserControls/mod_footer.ascx index 7024ec9..3f2fce9 100644 --- a/C-TRACK/WebUserControls/mod_footer.ascx +++ b/C-TRACK/WebUserControls/mod_footer.ascx @@ -1,9 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_footer" %>
-
- -
-
- +
+
+ +
+
+ <%: SteamWare.devicesAuthProxy.stObj.utente %> +
+
+ +
diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs index 5758c29..ec70240 100644 --- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs +++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs @@ -10,15 +10,16 @@ namespace C_TRACK.WebUserControls { protected void Page_Load(object sender, EventArgs e) { + string lastPage = Request.Url.LocalPath.Split('/').Last(); if (!Page.IsPostBack) { // se l'utente NON c'è torno a login... if (!devicesAuthProxy.stObj.isAuth) { - string lastPage = Request.Url.LocalPath.Split('/').Last(); if (lastPage != "" && lastPage != "login") { Session["nextPage"] = lastPage; + //} } // SE non sono in "safe page" if (memLayer.ML.CRS("_loginPages").IndexOf(lastPage) < 0) @@ -31,6 +32,13 @@ namespace C_TRACK.WebUserControls PagCorrente(); } } + // controllo pagina... + bool pageAuth = devicesAuthProxy.stObj.isPageEnabled(lastPage); + // controllo pag auth... + if (!pageAuth) + { + Response.Redirect("~/login"); + } lblTitolo.Text = memLayer.ML.confReadString("appName"); } ///