diff --git a/Jenkinsfile b/Jenkinsfile index 5d1d90fd..5078b165 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -158,8 +158,8 @@ pipeline { // lancio upload con nuget! echo 'Start upload with nuget push' - bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted" - bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted" + bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted" + bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted" } else if ( env.singleProj.contains(env.BRANCH_NAME) ) { parallel ( @@ -374,16 +374,16 @@ def sendSlack(status, colorCode) { } // funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy def fixNuget(solutionFile) { - // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" + // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-group" // solo la prima volta va aggiunta... hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C" if (hasSource == "0") { - bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" } else { - bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" } bat "e:\\nuget.exe restore ${solutionFile}" } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx b/MP-TAB/WebUserControls/mod_mappaStato.ascx index 9200488c..27d1963a 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx @@ -75,7 +75,7 @@ - + diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs b/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs index 744efc15..b67455e4 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs @@ -1,51 +1,52 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MoonProTablet.WebUserControls { - public partial class mod_mappaStato { - + public partial class mod_mappaStato + { + /// - /// Controllo UpdatePanel1. + /// UpdatePanel1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel UpdatePanel1; - + /// - /// Controllo repLI. + /// repLI control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Repeater repLI; - + /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - + /// - /// Controllo Timer1. + /// Timer1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.Timer Timer1; } diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index b5fd940f..75b89af8 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -1672,9 +1672,12 @@ namespace MapoDb } string cookieName = memLayer.ML.CRS("cookieName"); //DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire")); - string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire"); + + string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire").Replace(".", ","); double dayExp = 1; - double.TryParse(cookieDayExpire, out dayExp); + NumberStyles style = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands; + CultureInfo culture = CultureInfo.CreateSpecificCulture("it-IT"); + double.TryParse(cookieDayExpire, style, culture, out dayExp); DateTime expDate = DateTime.Now.AddDays(dayExp); string Secret = authProxy.getSecret(Dominio, UsrName, matricola, DeviceName, adesso); string devSecret = SteamCrypto.EncryptString(Secret, cookieName);