diff options
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/cs_clone.cpp | 14 | ||||
| -rw-r--r-- | modules/commands/ns_register.cpp | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index 40ef67b53..5a5d52065 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -133,16 +133,24 @@ public: } else if (what.equals_ci("BADWORDS")) { - BadWords *target_badwords = target_ci->GetExt<BadWords>("badwords"), + BadWords *target_badwords = target_ci->Require<BadWords>("badwords"), *badwords = ci->Require<BadWords>("badwords"); - if (target_badwords) + + if (target_badwords && badwords) + { target_badwords->ClearBadWords(); - if (badwords) + for (unsigned i = 0; i < badwords->GetBadWordCount(); ++i) { const BadWord *bw = badwords->GetBadWord(i); target_badwords->AddBadWord(bw->word, bw->type); } + } + + if (badwords) + badwords->Check(); + if (target_badwords) + target_badwords->Check(); source.Reply(_("All badword entries from \002%s\002 have been cloned to \002%s\002."), channel.c_str(), target.c_str()); } diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index c7e50311d..a88306fe0 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -108,7 +108,6 @@ class CommandNSRegister : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - NickAlias *na; User *u = source.GetUser(); Anope::string u_nick = source.GetNick(); size_t nicklen = u_nick.length(); @@ -176,7 +175,7 @@ class CommandNSRegister : public Command this->OnSyntaxError(source, ""); else if (u && Anope::CurTime < u->lastnickreg + reg_delay) source.Reply(_("Please wait %d seconds before using the REGISTER command again."), (u->lastnickreg + reg_delay) - Anope::CurTime); - else if ((na = NickAlias::Find(u_nick))) + else if (NickAlias::Find(u_nick) != NULL) source.Reply(NICK_ALREADY_REGISTERED, u_nick.c_str()); else if (pass.equals_ci(u_nick) || (Config->GetBlock("options")->Get<bool>("strictpasswords") && pass.length() < 5)) source.Reply(MORE_OBSCURE_PASSWORD); @@ -187,7 +186,7 @@ class CommandNSRegister : public Command else { NickCore *nc = new NickCore(u_nick); - na = new NickAlias(u_nick, nc); + NickAlias *na = new NickAlias(u_nick, nc); Anope::Encrypt(pass, nc->pass); if (!email.empty()) nc->email = email; |