diff --git a/.vs/MP-IO/v14/.suo b/.vs/MP-IO/v14/.suo index 75c8e74b..5b8bde73 100644 Binary files a/.vs/MP-IO/v14/.suo and b/.vs/MP-IO/v14/.suo differ diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index dc284136..47b7f0a7 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -208,6 +208,14 @@ + + + + + + + + diff --git a/MP-IO.sln b/MP-IO.sln index e678f3c8..b94cd51e 100644 --- a/MP-IO.sln +++ b/MP-IO.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\Steamwar EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-IO", "MP-IO\MP-IO.csproj", "{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-API", "MP-API\MP-API.csproj", "{DBA8D30F-006A-4EDE-9D9B-A50A363098B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution 218_SP|Any CPU = 218_SP|Any CPU @@ -240,6 +242,56 @@ Global {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Valgasket|Any CPU.Build.0 = IIS02|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.WinLab|Any CPU.ActiveCfg = IIS02|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.WinLab|Any CPU.Build.0 = IIS02|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.218_SP|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.218_SP|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.218_test|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.218_test|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Alumat|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Alumat|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.CMS|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.CMS|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.DEMO|Any CPU.Build.0 = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.deploy|Any CPU.ActiveCfg = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.deploy|Any CPU.Build.0 = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Donati|Any CPU.ActiveCfg = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Donati|Any CPU.Build.0 = Debug|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.EQUA|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.EQUA|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.ETS|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.ETS|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.ETS-218|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS01|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.IIS02|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.OVH-demo|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.OVH-demo|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Release|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Steamware|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Steamware|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Valgasket|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.Valgasket|Any CPU.Build.0 = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.WinLab|Any CPU.ActiveCfg = Release|Any CPU + {DBA8D30F-006A-4EDE-9D9B-A50A363098B5}.WinLab|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 63d876d5..bc3ba1c3 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -88,6 +88,7 @@ + Designer @@ -140,6 +141,13 @@ sendReboot.aspx + + sigLogEnabled.aspx + ASPXCodeBehind + + + sigLogEnabled.aspx + status.aspx ASPXCodeBehind diff --git a/MP-IO/enabled.aspx.cs b/MP-IO/enabled.aspx.cs index b21e17a6..5eae191f 100644 --- a/MP-IO/enabled.aspx.cs +++ b/MP-IO/enabled.aspx.cs @@ -21,7 +21,7 @@ namespace MP_IO // legge i get x processare la seriale int idxMacchina = 0; bool enabled = false; - string answ = ""; + string answ = "ND"; try { idxMacchina = Convert.ToInt32(Request.QueryString["idxMacchina"]); diff --git a/MP-IO/sigLogEnabled.aspx b/MP-IO/sigLogEnabled.aspx new file mode 100644 index 00000000..82bcd263 --- /dev/null +++ b/MP-IO/sigLogEnabled.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="sigLogEnabled.aspx.cs" Inherits="MP_IO.sigLogEnabled" %> + + + + + + + + +
+
+ +
+
+ + diff --git a/MP-IO/sigLogEnabled.aspx.cs b/MP-IO/sigLogEnabled.aspx.cs new file mode 100644 index 00000000..426af5ce --- /dev/null +++ b/MP-IO/sigLogEnabled.aspx.cs @@ -0,0 +1,63 @@ +using System; +using SteamWare; + +namespace MP_IO +{ + public partial class sigLogEnabled : System.Web.UI.Page + { + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + // legge i get x processare la seriale + int idxMacchina = 0; + bool enabled = false; + string answ = "ND"; + try + { + idxMacchina = Convert.ToInt32(Request.QueryString["idxMacchina"]); + } + catch + { + idxMacchina = 0; + } + if (idxMacchina != 0) + { + try + { + enabled = MapoDb.MapoDb.obj.sLogEnabled(idxMacchina); + if (enabled) + { + answ = "OK"; + } + else + { + answ = "NO"; + } + } + catch (Exception exc) + { + if (memLayer.ML.confReadInt("_logLevel") > 5) + { + string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc); + logger.lg.scriviLog(errore, tipoLog.EXCEPTION); + answ = errore; + } + } + } + else + { + string errore = "Errore: parametri macchina vuoti"; + logger.lg.scriviLog(errore, tipoLog.ERROR); + answ = errore; + } + // ripulisco pagina restituita e tolgo html (solo codice ok/NO) + Response.Clear(); + Response.Write(answ); + Context.Response.End(); + } + } +} \ No newline at end of file diff --git a/MP-IO/sigLogEnabled.aspx.designer.cs b/MP-IO/sigLogEnabled.aspx.designer.cs new file mode 100644 index 00000000..6d4ececf --- /dev/null +++ b/MP-IO/sigLogEnabled.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 MP_IO +{ + + + public partial class sigLogEnabled + { + + /// + /// 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; + } +}