Removed nickrequests, instead have unconfirmed registrations. Also made ns_resetpass allow remote-id to get past things such as kill immed.

1 files changed, 0 insertions, 21 deletions

diff --git a/src/mail.cpp b/src/mail.cpp
index 3a07f7e49..58a0ddac8 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -37,27 +37,6 @@ void MailThread::Run()
 	SetExitState();
 }
 
-bool Mail(User *u, NickRequest *nr, BotInfo *service, const Anope::string &subject, const Anope::string &message)
-{
-	if (!u || !nr || !service || subject.empty() || message.empty())
-		return false;
-
-	if (!Config->UseMail)
-		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 (nr->email.empty())
-		u->SendMessage(service, _("E-mail for \002%s\002 is invalid."), nr->nick.c_str());
-	else
-	{
-		u->lastmail = nr->lastmail = Anope::CurTime;
-		threadEngine.Start(new MailThread(nr->nick, nr->email, subject, message));
-		return true;
-	}
-
-	return false;
-}
-
 bool Mail(User *u, NickCore *nc, BotInfo *service, const Anope::string &subject, const Anope::string &message)
 {
 	if (!u || !nc || !service || subject.empty() || message.empty())