diff options
| -rw-r--r-- | modules/commands/cs_clone.cpp | 14 | ||||
| -rw-r--r-- | modules/commands/ns_register.cpp | 5 | ||||
| -rw-r--r-- | src/bots.cpp | 2 | ||||
| -rw-r--r-- | src/language.cpp | 2 | ||||
| -rw-r--r-- | src/logger.cpp | 4 | ||||
| -rw-r--r-- | src/servers.cpp | 2 |
6 files changed, 18 insertions, 11 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; diff --git a/src/bots.cpp b/src/bots.cpp index ddffe53fe..bf5d653b6 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -36,7 +36,7 @@ BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const A // If we're synchronised with the uplink already, send the bot. if (Me && Me->IsSynced()) { - Anope::string tmodes = !this->botmodes.empty() ? ("+" + this->botmodes) : (IRCD ? IRCD->DefaultPseudoclientModes : ""); + Anope::string tmodes = !this->botmodes.empty() ? ("+" + this->botmodes) : IRCD->DefaultPseudoclientModes; if (!tmodes.empty()) this->SetModesInternal(this, tmodes.c_str()); diff --git a/src/language.cpp b/src/language.cpp index 6ae7ab152..de378be0f 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -88,7 +88,7 @@ const char *Language::Translate(const char *lang, const char *string) lang = Config->DefLanguage.c_str(); if (Anope::string(lang) == "en") - return string != NULL ? string : ""; + return string; ++_nl_msg_cat_cntr; #ifdef _WIN32 diff --git a/src/logger.cpp b/src/logger.cpp index 296b22dac..d9c0e5d66 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -145,7 +145,7 @@ Anope::string Log::BuildPrefix() const { case LOG_ADMIN: { - if (!this->c && !(this->u || this->nc)) + if (!this->c) break; buffer += "ADMIN: "; Anope::string cname = source != NULL && !source->command.empty() ? source->command : this->c->name; @@ -159,7 +159,7 @@ Anope::string Log::BuildPrefix() const } case LOG_OVERRIDE: { - if (!this->c && !(this->u || this->nc)) + if (!this->c) break; buffer += "OVERRIDE: "; Anope::string cname = source != NULL && !source->command.empty() ? source->command : this->c->name; diff --git a/src/servers.cpp b/src/servers.cpp index 4bd9746c3..713e4a66e 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -28,7 +28,7 @@ Anope::map<Server *> Servers::ByID; std::set<Anope::string> Servers::Capab; -Server::Server(Server *up, const Anope::string &sname, unsigned shops, const Anope::string &desc, const Anope::string &ssid, bool jupe) : name(sname), hops(shops), description(desc), sid(ssid), uplink(up) +Server::Server(Server *up, const Anope::string &sname, unsigned shops, const Anope::string &desc, const Anope::string &ssid, bool jupe) : name(sname), hops(shops), description(desc), sid(ssid), uplink(up), users(0) { syncing = true; juped = jupe; |