diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index a6d9c8d1..efe966f5 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -1346,7 +1346,7 @@ - + Always diff --git a/MP-TAB/NLog.config b/MP-TAB/NLog.config index 8879ef3e..f37057fc 100644 --- a/MP-TAB/NLog.config +++ b/MP-TAB/NLog.config @@ -6,29 +6,68 @@ throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log"> - - + - - + - - + + + + + - + + + + + + + + + + \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_enrollByAuthKey.ascx.cs b/MP-TAB/WebUserControls/mod_enrollByAuthKey.ascx.cs index ea0b4727..041b1c15 100644 --- a/MP-TAB/WebUserControls/mod_enrollByAuthKey.ascx.cs +++ b/MP-TAB/WebUserControls/mod_enrollByAuthKey.ascx.cs @@ -1,5 +1,7 @@ using SteamWare; using System; +using System.Web; +using System.Web.UI; namespace MoonProTablet.WebUserControls { @@ -51,6 +53,7 @@ namespace MoonProTablet.WebUserControls /// protected void btnConferma_Click(object sender, EventArgs e) { + Page page = this.Page; bool fatto = false; // controllo se ho i dati... string plainUserAuthKey = txtUserAuthKey.Text.Trim(); @@ -113,6 +116,8 @@ namespace MoonProTablet.WebUserControls catch { } Response.Redirect(memLayer.ML.CRS("mainPage"), true); + HttpContext.Current.ApplicationInstance.CompleteRequest(); + page.Visible = false; } } diff --git a/MP-TAB/WebUserControls/mod_title.ascx.cs b/MP-TAB/WebUserControls/mod_title.ascx.cs index 96752a2f..047860f3 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx.cs +++ b/MP-TAB/WebUserControls/mod_title.ascx.cs @@ -103,6 +103,7 @@ namespace MoonProTablet.WebUserControls /// private void checkAuthCookieMoonProTablet() { + Page page = this.Page; Uri MyUrl = Request.Url; string delimStr = "/"; char[] delimiter = delimStr.ToCharArray(); @@ -120,7 +121,9 @@ namespace MoonProTablet.WebUserControls // solo se NON sono alla pagina di registrazione o altre SAFE pages...... if (memLayer.ML.CRS("safePages").ToLower().IndexOf(_paginaCorrente.ToLower()) < 0) { - Response.Redirect("~/regNewDevice"); + Response.Redirect("~/regNewDevice", false); + HttpContext.Current.ApplicationInstance.CompleteRequest(); + page.Visible = false; } } else @@ -164,7 +167,9 @@ namespace MoonProTablet.WebUserControls memLayer.ML.emptyCookieVal(memLayer.ML.CRS("cookieName")); // rimando pagina x registrazione devices logger.lg.scriviLog($"Dominio / UsrName non validi / non trovati:{Environment.NewLine}devSec:{devSecret}{Environment.NewLine}UsrName{UsrName}{Environment.NewLine}Dominio{Dominio}", tipoLog.STARTUP); - Response.Redirect("~/regNewDevice.aspx"); + Response.Redirect("~/regNewDevice.aspx", false); + HttpContext.Current.ApplicationInstance.CompleteRequest(); + page.Visible = false; } } } diff --git a/MP-TAB/logs/PlaceHolder.file b/MP-TAB/logs/PlaceHolder.file deleted file mode 100644 index 5f282702..00000000 --- a/MP-TAB/logs/PlaceHolder.file +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file