From e9ed7d4b77015cbbc8c6017d958450ad6ec98a5f Mon Sep 17 00:00:00 2001
From: nlitkowski <norbert.litkowski@gmail.com>
Date: Thu, 20 Dec 2018 01:59:38 +0100
Subject: [PATCH] redirect do forum po mailu, bug fix, setings wywalone w
 kosmos

---
 .../Forum/MailSender/Controllers/HomeController.cs | 14 +++++++++-----
 Trunk/Server/Forum/MailSender/MailSender.csproj    |  1 -
 Trunk/Server/Forum/MailSender/Settings.cs          | 10 ----------
 Trunk/Server/Forum/MailSender/Web.config           |  5 +++++
 4 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 Trunk/Server/Forum/MailSender/Settings.cs

diff --git a/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs b/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs
index 93b9c0a..c28100d 100644
--- a/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs
+++ b/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs
@@ -4,6 +4,7 @@ using System.Web.Mvc;
 using System.Web.ModelBinding;
 using System;
 using Newtonsoft.Json;
+using System.Configuration;
 
 namespace MailSender.Controllers
 {
@@ -40,16 +41,19 @@ namespace MailSender.Controllers
         {
             if (ModelState.IsValid)
             {
-                var smtpClient = new SmtpClient(Settings.smtpServer, Settings.smtpPort)
+                var smtpClient = new SmtpClient(ConfigurationManager.AppSettings["smtp-server"],
+                    Int32.Parse(ConfigurationManager.AppSettings["smtp-port"]))
                 {
-                    Credentials = new NetworkCredential(Settings.user, Settings.pass),
+                    Credentials = new NetworkCredential(
+                        ConfigurationManager.AppSettings["user-mail"],
+                        ConfigurationManager.AppSettings["pass-mail"]),
                     EnableSsl = true
                 };
-                smtpClient.Send(Settings.user, model.EMailTo, model.Subject, model.Content);
-                return RedirectToAction("Index");
+                smtpClient.Send(ConfigurationManager.AppSettings["user-mail"], model.EMailTo, model.Subject, model.Content);
+                return Redirect(ConfigurationManager.AppSettings["forum-address"]);
             }
             else
-                return RedirectToAction("Error", new { errMsg = "Error nie umiesz pisac maila menelu" });
+                return RedirectToAction("Error", new { errMsg = "Błąd wysyłania wiadomości e-mail." });
         }
     }
 }
\ No newline at end of file
diff --git a/Trunk/Server/Forum/MailSender/MailSender.csproj b/Trunk/Server/Forum/MailSender/MailSender.csproj
index 4e0a161..42232af 100644
--- a/Trunk/Server/Forum/MailSender/MailSender.csproj
+++ b/Trunk/Server/Forum/MailSender/MailSender.csproj
@@ -175,7 +175,6 @@
     </Compile>
     <Compile Include="Models\MailModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\bootstrap-theme.css" />
diff --git a/Trunk/Server/Forum/MailSender/Settings.cs b/Trunk/Server/Forum/MailSender/Settings.cs
deleted file mode 100644
index 7fb56b1..0000000
--- a/Trunk/Server/Forum/MailSender/Settings.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace MailSender
-{
-    public class Settings
-    {
-        public static string smtpServer = "smtp.gmail.com";
-        public static int smtpPort = 587;
-        public static string user = "ttestowy504@gmail.com";
-        public static string pass = "ChyzySoftware";
-    }
-}
\ No newline at end of file
diff --git a/Trunk/Server/Forum/MailSender/Web.config b/Trunk/Server/Forum/MailSender/Web.config
index 299d8a9..99e7ada 100644
--- a/Trunk/Server/Forum/MailSender/Web.config
+++ b/Trunk/Server/Forum/MailSender/Web.config
@@ -10,6 +10,11 @@
   </configSections>
   <appSettings>
     <add key="webpages:Version" value="3.0.0.0" />
+    <add key="user-mail" value="ttestowy504@gmail.com" />
+    <add key="pass-mail" value="ChyzySoftware" />
+    <add key="smtp-port" value="587" />
+    <add key="smtp-server" value="smtp.gmail.com" />
+    <add key="forum-address" value="http://forum-inzynieria1.azurewebsites.net/home/index"/>
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />