diff options
| author |  Sadie Powell | 2020-04-09 18:06:50 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-04-09 18:06:50 +0100 |
| commit | e1ed9b275f465fbc235a23e416ba7626c7cba6cc (patch) | |
| tree | a0cda4ca3cf14e2731ada5cd6fc890eb90e80731 /src/modules/m_passforward.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Set the minimum length to 1 for most config items with a default. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_passforward.cpp')
| -rw-r--r-- | src/modules/m_passforward.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index 1e0d0b4ff..35b10ba5a 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -41,7 +41,7 @@ class ModulePassForward : public Module ConfigTag* tag = ServerInstance->Config->ConfValue("passforward"); nickrequired = tag->getString("nick", "NickServ"); forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired"); - forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass"); + forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass", 1); } void FormatStr(std::string& result, const std::string& format, const LocalUser* user) @@ -105,11 +105,14 @@ class ModulePassForward : public Module } std::string tmp; - FormatStr(tmp, forwardmsg, user); - ServerInstance->Parser.ProcessBuffer(user, tmp); + if (!forwardmsg.empty()) + { + FormatStr(tmp, forwardmsg, user); + ServerInstance->Parser.ProcessBuffer(user, tmp); + tmp.clear(); + } - tmp.clear(); - FormatStr(tmp,forwardcmd, user); + FormatStr(tmp, forwardcmd, user); ServerInstance->Parser.ProcessBuffer(user, tmp); } }; |