diff options
| -rw-r--r-- | include/services.h | 8 | ||||
| -rwxr-xr-x | language/update.sh | 6 | ||||
| -rw-r--r-- | modules/commands/bs_kick.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/cs_suspend.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ns_register.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/plexus.cpp | 18 |
6 files changed, 23 insertions, 15 deletions
diff --git a/include/services.h b/include/services.h index 388eff5d8..9719ab13e 100644 --- a/include/services.h +++ b/include/services.h @@ -676,14 +676,6 @@ enum #include "account.h" #include "commands.h" #include "bots.h" - -struct LevelInfo -{ - int what; - Anope::string name; - const char *desc; -}; - #include "channels.h" /** Channelban type flags diff --git a/language/update.sh b/language/update.sh index 28aa39f7d..73de65c01 100755 --- a/language/update.sh +++ b/language/update.sh @@ -1,20 +1,20 @@ #!/bin/bash -rm anope.pot +rm -f anope.pot touch anope.pot cd .. FILES=`find ./ -name *.cpp -o -name *.h | grep -v /modules/third/` for f in $FILES do - xgettext -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $f + xgettext -E -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $f done cd - for f in *.po do - msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot + msgmerge -E -v -s -U $f `echo $f | cut -d'.' -f1`.pot done rm -f *~ diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index ac0420dce..0612c7e40 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -642,7 +642,7 @@ class BanDataPurger : public CallBack { for (std::map<Anope::string, BanData>::iterator it2 = bandata.begin(), it2_end = bandata.end(); it2 != it2_end;) { - const Anope::string &user = it->first; + const Anope::string &user = it2->first; BanData *bd = &it2->second; ++it2; diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index d59ffb44b..d1bd7b72a 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -47,7 +47,7 @@ class CommandCSSuspend : public Command ci->SetFlag(CI_SUSPENDED); ci->Extend("suspend_by", new ExtensibleItemRegular<Anope::string>(u->nick)); if (!reason.empty()) - ci->Extend("suspend_reason", new ExtensibleItemRegular<Anope::string>(u->nick)); + ci->Extend("suspend_reason", new ExtensibleItemRegular<Anope::string>(reason)); if (ci->c) { diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index 552551994..22668e042 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -299,7 +299,7 @@ class CommandNSResend : public Command void OnServHelp(CommandSource &source) { if (Config->NSEmailReg) - source.Reply(" %-14s %s", this->name.c_str(),_("Resend the registration passcode")); + Command::OnServHelp(source); } }; diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index fd6379fc9..fa5f88f5a 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -27,7 +27,7 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 1, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* vidents */ + 1, /* vidents */ 1, /* svshold */ 1, /* time stamp on mode */ 1, /* UMODE */ @@ -159,6 +159,22 @@ class PlexusProto : public IRCDProto send_cmd(Config->Numeric, "ENCAP %s SVSNICK %s %ld %s %ld", u->server->GetName().c_str(), u->GetUID().c_str(), static_cast<long>(u->timestamp), newnick.c_str(), static_cast<long>(when)); } + void SendVhostDel(User *u) + { + BotInfo *bi = findbot(Config->HostServ); + if (u->HasMode(UMODE_CLOAK)) + u->RemoveMode(bi, UMODE_CLOAK); + else + this->SendVhost(u, u->GetIdent(), u->chost); + } + + void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) + { + if (!ident.empty()) + send_cmd(Config->Numeric, "ENCAP * CHGIDENT %s %s", u->nick.c_str(), ident.c_str()); + send_cmd(Config->Numeric, "ENCAP * CHGHOST %s %s", u->nick.c_str(), host.c_str()); + } + void SendConnect() { plexus_cmd_pass(Config->Uplinks[CurrentUplink]->password); |