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 @@
-
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 @@
+
+
+
+
+