diff --git a/MP-TAB/Default.aspx b/MP-TAB/Default.aspx index 5125b718..9912aada 100644 --- a/MP-TAB/Default.aspx +++ b/MP-TAB/Default.aspx @@ -1,5 +1,8 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="MoonProTablet.Default" %> +<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %> + + @@ -12,6 +15,7 @@

Smart device

Default page +

diff --git a/MP-TAB/Default.aspx.designer.cs b/MP-TAB/Default.aspx.designer.cs index 74a840f4..b5a29bc0 100644 --- a/MP-TAB/Default.aspx.designer.cs +++ b/MP-TAB/Default.aspx.designer.cs @@ -20,5 +20,14 @@ namespace MoonProTablet { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Controllo mod_checkHttps. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps; } } diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index e2b1c674..3933f574 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -21,12 +21,9 @@ 4.0 - - - - - - + 44328 + enabled + disabled @@ -471,6 +468,7 @@ + @@ -483,6 +481,7 @@ Web.config + @@ -660,6 +659,13 @@ Test.aspx + + tryLogin.aspx + ASPXCodeBehind + + + tryLogin.aspx + Turni.aspx ASPXCodeBehind @@ -696,6 +702,13 @@ BootstrapNoUpdPnl.Master + + mod_checkHttps.ascx + ASPXCodeBehind + + + mod_checkHttps.ascx + mod_commenti.ascx ASPXCodeBehind diff --git a/MP-TAB/MappaStato.aspx b/MP-TAB/MappaStato.aspx index 1ca7cb1a..908a3cb9 100644 --- a/MP-TAB/MappaStato.aspx +++ b/MP-TAB/MappaStato.aspx @@ -1,9 +1,12 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="MappaStato.aspx.cs" Inherits="MoonProTablet.MappaStato" %> <%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %> +
+
diff --git a/MP-TAB/MappaStato.aspx.designer.cs b/MP-TAB/MappaStato.aspx.designer.cs index 6ad6a387..459d4b9a 100644 --- a/MP-TAB/MappaStato.aspx.designer.cs +++ b/MP-TAB/MappaStato.aspx.designer.cs @@ -12,6 +12,15 @@ namespace MoonProTablet { public partial class MappaStato { + /// + /// Controllo mod_checkHttps. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps; + /// /// Controllo mod_mappaStato1. /// diff --git a/MP-TAB/Resources/Donati/BASI/Web.config.ref b/MP-TAB/Resources/Donati/BASI/Web.config.ref index 180f63bb..69e09e5c 100644 --- a/MP-TAB/Resources/Donati/BASI/Web.config.ref +++ b/MP-TAB/Resources/Donati/BASI/Web.config.ref @@ -54,9 +54,6 @@ - - - diff --git a/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref b/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref index d279810d..cebe06fe 100644 --- a/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref +++ b/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref @@ -55,9 +55,6 @@ - - - diff --git a/MP-TAB/Web-SQL2012.config b/MP-TAB/Web-SQL2012.config index 41d6b5e8..0159437e 100644 --- a/MP-TAB/Web-SQL2012.config +++ b/MP-TAB/Web-SQL2012.config @@ -87,9 +87,6 @@ - - - diff --git a/MP-TAB/Web-SQL2016.config b/MP-TAB/Web-SQL2016.config index 61fcee72..c42b7d77 100644 --- a/MP-TAB/Web-SQL2016.config +++ b/MP-TAB/Web-SQL2016.config @@ -87,9 +87,6 @@ - - - diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index ebb0b9ff..9bfe11fe 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -49,7 +49,6 @@ - @@ -71,9 +70,6 @@ - - - @@ -81,6 +77,8 @@ + + diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx b/MP-TAB/WebUserControls/mod_QRScanner.ascx index 02998b59..7d3bc71f 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx @@ -5,6 +5,13 @@

QR SCanner

+ + + + GO + + +
-
- - - - GO - -
diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs b/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs index 5248d064..624846a0 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs @@ -23,9 +23,11 @@ namespace MoonProTablet.WebUserControls protected void txtQRCode_TextChanged(object sender, EventArgs e) { - hlReload.NavigateUrl=txtQRCode.Text.Trim(); - hlReload.Text = txtQRCode.Text.Trim(); - hlReload.Enabled = true; + //// rimando a pagina di login... + //Response.Redirect(txtQRCode.Text.Trim()); + //hlReload.NavigateUrl=txtQRCode.Text.Trim(); + //hlReload.Text = txtQRCode.Text.Trim(); + //hlReload.Enabled = true; } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_checkHttps.ascx b/MP-TAB/WebUserControls/mod_checkHttps.ascx new file mode 100644 index 00000000..8dfb9123 --- /dev/null +++ b/MP-TAB/WebUserControls/mod_checkHttps.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_checkHttps.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_checkHttps" %> diff --git a/MP-TAB/WebUserControls/mod_checkHttps.ascx.cs b/MP-TAB/WebUserControls/mod_checkHttps.ascx.cs new file mode 100644 index 00000000..0b5ab50c --- /dev/null +++ b/MP-TAB/WebUserControls/mod_checkHttps.ascx.cs @@ -0,0 +1,36 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet.WebUserControls +{ + public partial class mod_checkHttps : SteamWare.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // se pagina richiesta in http ma con QR code rimando in https... + bool needHttps = memLayer.ML.CRS("forceSecurePages").IndexOf(titolo) >= 0; + if (needHttps != Request.IsSecureConnection) + { + string newUrl = Request.Url.AbsoluteUri; + // in questo caso scambio http <--> https + if (needHttps) + { + newUrl = newUrl.Replace("http://", "https://"); + } + else + { + newUrl = newUrl.Replace("https://", "http://"); + } + Response.Redirect(newUrl); + } + } + } + } +} \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_checkHttps.ascx.designer.cs b/MP-TAB/WebUserControls/mod_checkHttps.ascx.designer.cs new file mode 100644 index 00000000..af0bed13 --- /dev/null +++ b/MP-TAB/WebUserControls/mod_checkHttps.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet.WebUserControls +{ + + + public partial class mod_checkHttps + { + } +} diff --git a/MP-TAB/WebUserControls/mod_title.ascx.cs b/MP-TAB/WebUserControls/mod_title.ascx.cs index b662647a..d5bca4ca 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx.cs +++ b/MP-TAB/WebUserControls/mod_title.ascx.cs @@ -33,9 +33,9 @@ namespace MoonProTablet.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - // prima apertura registro NO popup = refresh enabled if (!Page.IsPostBack) { + // prima apertura registro NO popup = refresh enabled memLayer.ML.setSessionVal("refreshEnabled", true); } // se ho user/dominio e matricola in sessione NON controllo coockie diff --git a/MP-TAB/jumper.aspx.cs b/MP-TAB/jumper.aspx.cs index 65a63582..88222a92 100644 --- a/MP-TAB/jumper.aspx.cs +++ b/MP-TAB/jumper.aspx.cs @@ -21,14 +21,12 @@ namespace MoonProTablet string UserAuthKey = memLayer.ML.QSS("UserAuthKey"); if (MatrOpr >= 0 && UserAuthKey != "") { - // reset utente... - // salvo in sessione memLayer.ML.setSessionVal("MatrOpr", MatrOpr); memLayer.ML.setSessionVal("UserAuthKey", UserAuthKey); } // redirect... - Response.Redirect("regNewDevice"); + Response.Redirect("tryLogin"); } } } \ No newline at end of file diff --git a/MP-TAB/regNewDevice.aspx b/MP-TAB/regNewDevice.aspx index a4f7db7d..e37cf8e0 100644 --- a/MP-TAB/regNewDevice.aspx +++ b/MP-TAB/regNewDevice.aspx @@ -2,10 +2,13 @@ <%@ Register Src="WebUserControls/mod_regNewDevice.ascx" TagName="mod_regNewDevice" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_QRScanner.ascx" TagPrefix="uc1" TagName="mod_QRScanner" %> +<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %> +
+
diff --git a/MP-TAB/regNewDevice.aspx.designer.cs b/MP-TAB/regNewDevice.aspx.designer.cs index b08e7770..4a7987be 100644 --- a/MP-TAB/regNewDevice.aspx.designer.cs +++ b/MP-TAB/regNewDevice.aspx.designer.cs @@ -12,6 +12,15 @@ namespace MoonProTablet { public partial class regNewDevice { + /// + /// Controllo mod_checkHttps. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps; + /// /// Controllo mod_regNewDevice1. /// diff --git a/MP-TAB/tryLogin.aspx b/MP-TAB/tryLogin.aspx new file mode 100644 index 00000000..7010f108 --- /dev/null +++ b/MP-TAB/tryLogin.aspx @@ -0,0 +1,20 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="tryLogin.aspx.cs" Inherits="MoonProTablet.tryLogin" %> + +<%@ Register Src="~/WebUserControls/mod_enrollByJumperAuthKey.ascx" TagPrefix="uc1" TagName="mod_enrollByJumperAuthKey" %> + + + + + + + + + + +
+
+ +
+
+ + diff --git a/MP-TAB/tryLogin.aspx.cs b/MP-TAB/tryLogin.aspx.cs new file mode 100644 index 00000000..b786bc1e --- /dev/null +++ b/MP-TAB/tryLogin.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet +{ + public partial class tryLogin : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-TAB/tryLogin.aspx.designer.cs b/MP-TAB/tryLogin.aspx.designer.cs new file mode 100644 index 00000000..76510960 --- /dev/null +++ b/MP-TAB/tryLogin.aspx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet { + + + public partial class tryLogin { + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Controllo mod_enrollByJumperAuthKey. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_enrollByJumperAuthKey mod_enrollByJumperAuthKey; + } +} diff --git a/MP-TAB/utility.cs b/MP-TAB/utility.cs index de9e6779..01886391 100644 --- a/MP-TAB/utility.cs +++ b/MP-TAB/utility.cs @@ -5,42 +5,6 @@ namespace MoonProTablet { public class utility { - /// - /// determina se si debba usare CDN x scaricare librerie asp.net ajax - /// - public static bool EnableCdnAjax - { - get - { - bool answ = false; - try - { - answ = memLayer.ML.confReadBool("EnableCdnAjax"); - } - catch - { - } - return answ; - } - } - /// - /// determina se si debba usare CDN x scaricare librerie jquery - /// - public static bool EnableCdnJQ - { - get - { - bool answ = false; - try - { - answ = memLayer.ML.confReadBool("EnableCdnJQ"); - } - catch - { - } - return answ; - } - } /// /// formatta la durata in minuti in un modo "human readable" gg/min/ore ///