diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 40d48a5..30b5282 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -31,7 +31,7 @@ - + @@ -55,6 +55,13 @@ + + + + + + + diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index b586905..5144838 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -415,9 +415,6 @@ namespace ETS_WS // scrivo nuovo testo! StreamWriter sw = file.CreateText(); sw.Write(contenutoEmail); - //StreamWriter sw = file.AppendText(); - //sw.Write(Environment.NewLine); - //sw.Write("X-Unsent: 1"); sw.Flush(); return file.Name; } @@ -795,8 +792,18 @@ namespace ETS_WS { destinatario = mittente; } - string subject = string.Format("{0}, prot. num {1}", docsData.oggetto, NumProt); - string body = string.Format("Villa D'Almè, {1:dd/MM/yyyy}{0}Rif.Comm. N.: {2}{0}Prot. N.: {3}{0}{0}{0}{0}Distinti Saluti.{0}{4}{0}{0}ETS S.p.a.{0}Via Mazzi, 32 - 24018 Villa D'Almè (BG){0}Trasmesso da:{0}{5}", Environment.NewLine, docsData.dataDoc, docsData.commessa, NumProt, redattore, mittente); + string subject = string.Format(utils.obj.confReadString("mailSubject"), docsData.oggetto, NumProt); + string body = ""; + //body += string.Format("Villa D'Almè, {1:dd/MM/yyyy}{0}", Environment.NewLine, docsData.dataDoc); + //body += string.Format("{1} - {2}{0}", Environment.NewLine, docsData.commessa, docsData.oggetto); + //body += string.Format("Prot. N.: {1}{0}{0}{0}{0}", Environment.NewLine, NumProt); + //body += string.Format("Distinti Saluti.{0}{1}{0}{0}ETS S.p.A.{0}---------------------------------{0}Via Mazzi, 32{0}24018 Villa D'Almè{0}Bergamo{0}{0}", Environment.NewLine, redattore); + //body += string.Format("Trasmesso da:{0}{1}", Environment.NewLine, mittente); + body += string.Format(utils.obj.confReadString("mailBody01"), Environment.NewLine, docsData.dataDoc); + body += string.Format(utils.obj.confReadString("mailBody02"), Environment.NewLine, docsData.commessa, docsData.oggetto); + body += string.Format(utils.obj.confReadString("mailBody03"), Environment.NewLine, NumProt); + body += string.Format(utils.obj.confReadString("mailBody04"), Environment.NewLine, redattore); + body += string.Format(utils.obj.confReadString("mailBody05"), Environment.NewLine, mittente); string newFileName = WebShipUtils.CreaEml(mittente, destinatario, subject, body, null, HttpContext.Current.Server.MapPath(pathDest)); // sostituisco file appena creato con quello nuovo fileMover.obj.muoviFile(pathDest, pathDest, newFileName, WebShipUtils.nomeFileFullFromIdxFile(idxFile), true); diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 9ea4db7..631b5cb 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 a258439..b732c03 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/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index 6defa02..71e4d5b 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -5,6 +5,7 @@ --> + @@ -30,7 +31,7 @@ - + @@ -46,14 +47,21 @@ - - + + + + + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index 5fb366d..f3a61ef 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -5,6 +5,7 @@ --> + @@ -30,7 +31,7 @@ - + @@ -46,14 +47,21 @@ - - + + + + + + + + + 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 bc4110a..308c4b2 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 9ea4db7..631b5cb 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/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index 8dfe7fc..e192842 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 32c3db7..99631f1 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -5,6 +5,7 @@ --> + @@ -30,7 +31,7 @@ - + @@ -46,14 +47,21 @@ - - + + + + + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index 6defa02..71e4d5b 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -5,6 +5,7 @@ --> + @@ -30,7 +31,7 @@ - + @@ -46,14 +47,21 @@ - - + + + + + + + + + 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 a258439..b732c03 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/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index a258439..b732c03 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ