1 files changed, 12 insertions, 9 deletions

diff --git a/src/mail.cpp b/src/mail.cpp
index 851fe6d4e..3b2b1272f 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -14,7 +14,7 @@
 #include "mail.h"
 #include "config.h"
 
-Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, const Anope::string &a, const Anope::string &s, const Anope::string &m) : Thread(), sendmail_path(Config->SendMailPath), send_from(sf), mail_to(mailto), addr(a), subject(s), message(m), dont_quote_addresses(Config->DontQuoteAddresses), success(false)
+Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, const Anope::string &a, const Anope::string &s, const Anope::string &m) : Thread(), sendmail_path(Config->GetBlock("mail")->Get<const Anope::string &>("sendmailpath")), send_from(sf), mail_to(mailto), addr(a), subject(s), message(m), dont_quote_addresses(Config->GetBlock("mail")->Get<bool>("dontquoteaddresses")), success(false)
 {
 }
 
@@ -55,31 +55,33 @@ bool Mail::Send(User *u, NickCore *nc, const BotInfo *service, const Anope::stri
 {
 	if (!nc || !service || subject.empty() || message.empty())
 		return false;
+
+	Configuration::Block *b = Config->GetBlock("mail");
 	
 	if (!u)
 	{
-		if (!Config->UseMail)
+		if (!b->Get<bool>("usemail") || b->Get<const Anope::string &>("sendfrom").empty())
 			return false;
 		else if (nc->email.empty())
 			return false;
 
 		nc->lastmail = Anope::CurTime;
-		Thread *t = new Mail::Message(Config->SendFrom, nc->display, nc->email, subject, message);
+		Thread *t = new Mail::Message(b->Get<const Anope::string &>("sendfrom"), nc->display, nc->email, subject, message);
 		t->Start();
 		return true;
 	}
 	else
 	{
-		if (!Config->UseMail)
+		if (!b->Get<bool>("usemail") || b->Get<const Anope::string &>("sendfrom").empty())
 			u->SendMessage(service, _("Services have been configured to not send mail."));
-		else if (Anope::CurTime - u->lastmail < Config->MailDelay)
-			u->SendMessage(service, _("Please wait \002%d\002 seconds and retry."), Config->MailDelay - (Anope::CurTime - u->lastmail));
+		else if (Anope::CurTime - u->lastmail < b->Get<time_t>("delay"))
+			u->SendMessage(service, _("Please wait \002%d\002 seconds and retry."), b->Get<time_t>("delay") - (Anope::CurTime - u->lastmail));
 		else if (nc->email.empty())
 			u->SendMessage(service, _("E-mail for \002%s\002 is invalid."), nc->display.c_str());
 		else
 		{
 			u->lastmail = nc->lastmail = Anope::CurTime;
-			Thread *t = new Mail::Message(Config->SendFrom, nc->display, nc->email, subject, message);
+			Thread *t = new Mail::Message(b->Get<const Anope::string &>("sendfrom"), nc->display, nc->email, subject, message);
 			t->Start();
 			return true;
 		}
@@ -90,11 +92,12 @@ bool Mail::Send(User *u, NickCore *nc, const BotInfo *service, const Anope::stri
 
 bool Mail::Send(NickCore *nc, const Anope::string &subject, const Anope::string &message)
 {
-	if (!Config->UseMail || !nc || nc->email.empty() || subject.empty() || message.empty())
+	Configuration::Block *b = Config->GetBlock("mail");
+	if (!b->Get<bool>("usemail") || b->Get<const Anope::string &>("sendfrom").empty() || !nc || nc->email.empty() || subject.empty() || message.empty())
 		return false;
 
 	nc->lastmail = Anope::CurTime;
-	Thread *t = new Mail::Message(Config->SendFrom, nc->display, nc->email, subject, message);
+	Thread *t = new Mail::Message(b->Get<const Anope::string &>("sendfrom"), nc->display, nc->email, subject, message);
 	t->Start();
 
 	return true;