diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 3f6a9e4..39a1ce0 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -28,11 +28,12 @@ - - + + + diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index 30eb2e3..485cf3a 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -670,7 +670,18 @@ namespace ETS_WS { // creo un NUOVO file alla destinazione sostituendo l'esistente con apposita classe string mittente = utils.obj.currUserEmail; + // controllo, se non è valida carico email "fuffa" + if (mittente.IndexOf("@") < 0) + { + mittente = utils.obj.confReadString("stdEmail"); + } + // calcolo destinatario string destinatario = WebShipUtils.emailDaCodForn(docsData.fonte); + // controllo email dest valida... + if (destinatario.IndexOf("@") < 0) + { + destinatario = mittente; + } string subject = string.Format("{0}, prot. num {1}", docsData.oggetto, protocollo); string body = string.Format("Commessa: {1}{0}Fase: {2}{0}Oggetto: {3}{0}prot. num: {4}", Environment.NewLine, docsData.commessa, docsData.fase, docsData.oggetto, protocollo); string newFileName = WebShipUtils.CreaEml(mittente, destinatario, subject, body, null, HttpContext.Current.Server.MapPath(pathDest)); diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index f8602c6..1575c55 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index ecfeee9..17d18cc 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index 0083116..5e7a2af 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index f8602c6..07ba72b 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/build.force b/ETS-WS/ETS-WS/obj/ETS/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index ecfeee9..abc0964 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt index a49214f..7d3ba11 100644 --- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt @@ -7,3 +7,4 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NL C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\DocumentFormat.OpenXml.dll diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache index c6f0812..a582b4d 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 0adeadf..17d18cc 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache index d0a4a67..d072c87 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index ecfeee9..abc0964 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.pdb b/ETS_Data/obj/ETS/ETS_Data.pdb index 6cf8df9..39f62ee 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.pdb and b/ETS_Data/obj/ETS/ETS_Data.pdb differ