From 035905d321e5c6b5c720adb5f5c7ab6eb4dfa65a Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 25 Jun 2025 15:39:35 +0100 Subject: [PATCH 1/2] Fix example messages using .site which is a real TLD now. --- data/modules.example.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/modules.example.conf b/data/modules.example.conf index 686963e2c..e8fa55167 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -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" } /* @@ -677,13 +677,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" } /* From fca421aa2a55e1211738368c1f2255ef31f942e8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 25 Jun 2025 17:36:16 +0100 Subject: [PATCH 2/2] Fix resetpass confirming accounts when not using email confirmation. Fixes MantisBT bug 1734. --- modules/commands/ns_resetpass.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp index 09427e38a..15ea09252 100644 --- a/modules/commands/ns_resetpass.cpp +++ b/modules/commands/ns_resetpass.cpp @@ -106,7 +106,9 @@ class NSResetPass : public Module else if (passcode.equals_cs(ri->code)) { reset.Unset(nc); - nc->Shrink("UNCONFIRMED"); + + if (Config->GetModule("nickserv")->Get("registration").equals_ci("mail")) + nc->Shrink("UNCONFIRMED"); Log(LOG_COMMAND, source, &commandnsresetpass) << "to confirm RESETPASS and forcefully identify as " << na->nick;