mirror of
https://github.com/anope/anope.git
synced 2026-07-01 06:36:39 +02:00
Merge branch '2.0' into 2.1.
This commit is contained in:
@@ -304,13 +304,13 @@ module { name = "help" }
|
||||
*
|
||||
* If not set, then registration is not blocked.
|
||||
*/
|
||||
#disable_register_reason = "To register on this network visit https://some.misconfigured.site/register"
|
||||
#disable_register_reason = "To register on this network visit https://some.misconfigured.site.example/register"
|
||||
|
||||
/*
|
||||
* If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
|
||||
* If not set, then email changing is not blocked.
|
||||
*/
|
||||
#disable_email_reason = "To change your email address visit https://some.misconfigured.site"
|
||||
#disable_email_reason = "To change your email address visit https://some.misconfigured.site.example"
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -691,13 +691,13 @@ module
|
||||
* If set, the reason to give the users who try to "/msg NickServ REGISTER".
|
||||
* If not set, then registration is not blocked.
|
||||
*/
|
||||
#disable_reason = "To register on this network visit https://some.misconfigured.site/register"
|
||||
#disable_reason = "To register on this network visit https://some.misconfigured.site.example/register"
|
||||
|
||||
/*
|
||||
* If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
|
||||
* If not set, then email changing is not blocked.
|
||||
*/
|
||||
#disable_email_reason = "To change your email address visit https://some.misconfigured.site"
|
||||
#disable_email_reason = "To change your email address visit https://some.misconfigured.site.example"
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -133,7 +133,10 @@ public:
|
||||
}
|
||||
|
||||
reset.Unset(nc);
|
||||
nc->Shrink<bool>("UNCONFIRMED");
|
||||
|
||||
if (Config->GetModule("nickserv").Get<const Anope::string>("registration").equals_ci("mail"))
|
||||
nc->Shrink<bool>("UNCONFIRMED");
|
||||
|
||||
if (source.GetUser())
|
||||
source.GetUser()->Identify(na);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user