From 6617d29b5227f962c348e638a373ebb78989b7ba Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 14 Dec 2019 18:37:23 +0000 Subject: Fix a bunch of broken indentation. --- modules/commands/bs_assign.cpp | 2 +- modules/commands/bs_kick.cpp | 4 +- modules/commands/bs_set.cpp | 2 +- modules/commands/cs_access.cpp | 2 +- modules/commands/cs_ban.cpp | 2 +- modules/commands/cs_flags.cpp | 2 +- modules/commands/cs_log.cpp | 2 +- modules/commands/cs_mode.cpp | 2 +- modules/commands/cs_xop.cpp | 4 +- modules/commands/ns_ajoin.cpp | 2 +- modules/commands/ns_cert.cpp | 2 +- modules/commands/os_dns.cpp | 4 +- modules/commands/os_info.cpp | 6 +-- modules/commands/os_login.cpp | 4 +- modules/commands/os_sxline.cpp | 6 +-- modules/database/db_flatfile.cpp | 4 +- modules/database/db_old.cpp | 4 +- modules/encryption/enc_md5.cpp | 2 +- modules/encryption/enc_old.cpp | 2 +- modules/encryption/enc_sha1.cpp | 2 +- modules/encryption/enc_sha256.cpp | 2 +- modules/extra/m_ssl_gnutls.cpp | 4 +- modules/extra/m_ssl_openssl.cpp | 4 +- modules/m_dns.cpp | 4 +- modules/m_proxyscan.cpp | 6 +-- modules/protocol/inspircd12.cpp | 2 +- modules/protocol/inspircd20.cpp | 70 +++++++++++++++--------------- modules/protocol/inspircd3.cpp | 70 +++++++++++++++--------------- modules/protocol/ngircd.cpp | 14 +++--- modules/protocol/unreal.cpp | 40 ++++++++--------- modules/protocol/unreal4.cpp | 40 ++++++++--------- modules/pseudoclients/chanserv.cpp | 2 +- modules/webcpanel/pages/chanserv/access.h | 2 +- modules/webcpanel/pages/chanserv/akick.h | 2 +- modules/webcpanel/pages/chanserv/info.h | 2 +- modules/webcpanel/pages/chanserv/set.h | 2 +- modules/webcpanel/pages/hostserv/request.h | 2 +- modules/webcpanel/pages/logout.h | 2 +- modules/webcpanel/pages/memoserv/memos.h | 2 +- modules/webcpanel/pages/nickserv/access.h | 2 +- modules/webcpanel/pages/nickserv/alist.h | 2 +- modules/webcpanel/pages/nickserv/cert.h | 2 +- modules/webcpanel/pages/nickserv/info.h | 2 +- 43 files changed, 170 insertions(+), 170 deletions(-) (limited to 'modules') diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index 63a2e659c..d26d612b1 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -46,7 +46,7 @@ class CommandBSAssign : public Command } AccessGroup access = source.AccessFor(ci); - if (ci->HasExt("BS_NOBOT") || (!access.HasPriv("ASSIGN") && !source.HasPriv("botserv/administration"))) + if (ci->HasExt("BS_NOBOT") || (!access.HasPriv("ASSIGN") && !source.HasPriv("botserv/administration"))) { source.Reply(ACCESS_DENIED); return; diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index dcd78c82d..43e30a9eb 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -718,7 +718,7 @@ class CommandBSKickRepeat : public CommandBSKickBase class CommandBSKickReverses : public CommandBSKickBase { public: - CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3) + CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3) { this->SetDesc(_("Configures reverses kicker")); this->SetSyntax(_("\037channel\037 {\037ON|OFF\037} [\037ttb\037]")); @@ -934,7 +934,7 @@ struct BanData data_type data_map; public: - BanData(Extensible *) { } + BanData(Extensible *) { } Data &get(const Anope::string &key) { diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index 1bd8e289f..e4bc750c4 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -69,7 +69,7 @@ class CommandBSSet : public Command class CommandBSSetBanExpire : public Command { public: - class UnbanTimer : public Timer + class UnbanTimer : public Timer { Anope::string chname; Anope::string mask; diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 263b1917b..d2578130e 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -25,7 +25,7 @@ class AccessChanAccess : public ChanAccess public: int level; - AccessChanAccess(AccessProvider *p) : ChanAccess(p), level(0) + AccessChanAccess(AccessProvider *p) : ChanAccess(p), level(0) { } diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index 6e83722c8..6f8abf4f5 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -16,7 +16,7 @@ static Module *me; class TempBan : public Timer { private: - Anope::string channel; + Anope::string channel; Anope::string mask; Anope::string mode; diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 9ae6aeb56..c0910ec6f 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -18,7 +18,7 @@ class FlagsChanAccess : public ChanAccess public: std::set flags; - FlagsChanAccess(AccessProvider *p) : ChanAccess(p) + FlagsChanAccess(AccessProvider *p) : ChanAccess(p) { } diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 655daa488..ee3cd484b 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -81,7 +81,7 @@ struct LogSettingsImpl : LogSettings { LogSettingsImpl(Extensible *) { } - ~LogSettingsImpl() + ~LogSettingsImpl() { for (iterator it = (*this)->begin(); it != (*this)->end();) { diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index a666f6c68..6df197a6c 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -879,7 +879,7 @@ class CommandCSModes : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "on " << targ->nick; } - const Anope::string GetDesc(CommandSource &source) const anope_override + const Anope::string GetDesc(CommandSource &source) const anope_override { const std::pair &m = modes[source.command]; if (!m.second.empty()) diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index e2e02aa7d..795b23e38 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -22,7 +22,7 @@ class XOPChanAccess : public ChanAccess public: Anope::string type; - XOPChanAccess(AccessProvider *p) : ChanAccess(p) + XOPChanAccess(AccessProvider *p) : ChanAccess(p) { } @@ -484,7 +484,7 @@ class CommandCSXOP : public Command this->SetSyntax(_("\037channel\037 CLEAR")); } - const Anope::string GetDesc(CommandSource &source) const anope_override + const Anope::string GetDesc(CommandSource &source) const anope_override { return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str()); } diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 1273d5a2e..0659b44ba 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -144,7 +144,7 @@ class CommandNSAJoin : public Command else if (i != (*channels)->size()) alreadyadded += chan + ", "; else if (IRCD->IsChannelValid(chan) == false) - source.Reply(CHAN_X_INVALID, chan.c_str()); + source.Reply(CHAN_X_INVALID, chan.c_str()); else { Channel *c = Channel::Find(chan); diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index 933bfffd0..1831c4a4a 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -33,7 +33,7 @@ struct NSCertListImpl : NSCertList std::vector certs; public: - NSCertListImpl(Extensible *obj) : nc(anope_dynamic_static_cast(obj)) { } + NSCertListImpl(Extensible *obj) : nc(anope_dynamic_static_cast(obj)) { } ~NSCertListImpl() { diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp index 84092a9d3..ab252bf69 100644 --- a/modules/commands/os_dns.cpp +++ b/modules/commands/os_dns.cpp @@ -91,12 +91,12 @@ class DNSServer : public Serializable std::vector ips; unsigned limit; /* wants to be in the pool */ - bool pooled; + bool pooled; /* is actually in the pool */ bool active; public: - std::set zones; + std::set zones; time_t repool; DNSServer(const Anope::string &sn) : Serializable("DNSServer"), server_name(sn), limit(0), pooled(false), active(false), repool(0) diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp index 53e54f1ab..bc1edff10 100644 --- a/modules/commands/os_info.cpp +++ b/modules/commands/os_info.cpp @@ -164,7 +164,7 @@ class CommandOSInfo : public Command source.Reply(_("Added info to \002%s\002."), target.c_str()); Log(LOG_ADMIN, source, this) << "to add information to " << target; - if (Anope::ReadOnly) + if (Anope::ReadOnly) source.Reply(READ_ONLY_MODE); } else if (cmd.equals_ci("DEL")) @@ -208,7 +208,7 @@ class CommandOSInfo : public Command source.Reply(_("Deleted info from \002%s\002."), target.c_str()); Log(LOG_ADMIN, source, this) << "to remove information from " << target; - if (Anope::ReadOnly) + if (Anope::ReadOnly) source.Reply(READ_ONLY_MODE); } } @@ -227,7 +227,7 @@ class CommandOSInfo : public Command source.Reply(_("Cleared info from \002%s\002."), target.c_str()); Log(LOG_ADMIN, source, this) << "to clear information for " << target; - if (Anope::ReadOnly) + if (Anope::ReadOnly) source.Reply(READ_ONLY_MODE); } else diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp index 2ace9ad28..9ec1d8e95 100644 --- a/modules/commands/os_login.cpp +++ b/modules/commands/os_login.cpp @@ -55,7 +55,7 @@ class CommandOSLogin : public Command return true; } - const Anope::string GetDesc(CommandSource &source) const anope_override + const Anope::string GetDesc(CommandSource &source) const anope_override { return Anope::printf(Language::Translate(source.GetAccount(), _("Login to %s")), source.service->nick.c_str()); } @@ -97,7 +97,7 @@ class CommandOSLogout : public Command return true; } - const Anope::string GetDesc(CommandSource &source) const anope_override + const Anope::string GetDesc(CommandSource &source) const anope_override { return Anope::printf(Language::Translate(source.GetAccount(), _("Logout from %s")), source.service->nick.c_str()); } diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp index 18a8ec286..b21febf9a 100644 --- a/modules/commands/os_sxline.cpp +++ b/modules/commands/os_sxline.cpp @@ -57,7 +57,7 @@ class SXLineDelCallback : public NumberList class CommandOSSXLineBase : public Command { private: - virtual XLineManager* xlm() = 0; + virtual XLineManager* xlm() = 0; virtual void OnAdd(CommandSource &source, const std::vector ¶ms) = 0; @@ -420,7 +420,7 @@ class CommandOSSNLine : public CommandOSSXLineBase ServiceReference snlines; public: - CommandOSSNLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/snline"), snlines("XLineManager", "xlinemanager/snline") + CommandOSSNLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/snline"), snlines("XLineManager", "xlinemanager/snline") { this->SetSyntax(_("ADD [+\037expiry\037] \037mask\037:\037reason\037")); this->SetSyntax(_("DEL {\037mask\037 | \037entry-num\037 | \037list\037 | \037id\037}")); @@ -652,7 +652,7 @@ class CommandOSSQLine : public CommandOSSXLineBase source.Reply(READ_ONLY_MODE); } - ServiceReference sqlines; + ServiceReference sqlines; public: CommandOSSQLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/sqline"), sqlines("XLineManager", "xlinemanager/sqline") { diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 228f0f4ca..24278e001 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -18,7 +18,7 @@ class SaveData : public Serialize::Data { public: - Anope::string last; + Anope::string last; std::fstream *fs; SaveData() : fs(NULL) { } @@ -38,7 +38,7 @@ class SaveData : public Serialize::Data class LoadData : public Serialize::Data { public: - std::fstream *fs; + std::fstream *fs; unsigned int id; std::map data; std::stringstream ss; diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 6b179fa79..66db18834 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -81,8 +81,8 @@ else \ #define OLD_BS_NOBOT 0x00000020 /* BotServ Kickers flags */ -#define OLD_BS_KICK_BOLDS 0x80000000 -#define OLD_BS_KICK_COLORS 0x40000000 +#define OLD_BS_KICK_BOLDS 0x80000000 +#define OLD_BS_KICK_COLORS 0x40000000 #define OLD_BS_KICK_REVERSES 0x20000000 #define OLD_BS_KICK_UNDERLINES 0x10000000 #define OLD_BS_KICK_BADWORDS 0x08000000 diff --git a/modules/encryption/enc_md5.cpp b/modules/encryption/enc_md5.cpp index c76e25b8b..9db5f8937 100644 --- a/modules/encryption/enc_md5.cpp +++ b/modules/encryption/enc_md5.cpp @@ -321,7 +321,7 @@ class MD5Context : public Encryption::Context class MD5Provider : public Encryption::Provider { public: - MD5Provider(Module *creator) : Encryption::Provider(creator, "md5") { } + MD5Provider(Module *creator) : Encryption::Provider(creator, "md5") { } Encryption::Context *CreateContext(Encryption::IV *iv) anope_override { diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp index 6f16d2a6c..b4778454a 100644 --- a/modules/encryption/enc_old.cpp +++ b/modules/encryption/enc_old.cpp @@ -17,7 +17,7 @@ static ServiceReference md5("Encryption::Provider", "md5") class OldMD5Provider : public Encryption::Provider { public: - OldMD5Provider(Module *creator) : Encryption::Provider(creator, "oldmd5") { } + OldMD5Provider(Module *creator) : Encryption::Provider(creator, "oldmd5") { } Encryption::Context *CreateContext(Encryption::IV *iv) anope_override { diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp index 05c8669a8..7f86e0f56 100644 --- a/modules/encryption/enc_sha1.cpp +++ b/modules/encryption/enc_sha1.cpp @@ -181,7 +181,7 @@ class SHA1Context : public Encryption::Context class SHA1Provider : public Encryption::Provider { public: - SHA1Provider(Module *creator) : Encryption::Provider(creator, "sha1") { } + SHA1Provider(Module *creator) : Encryption::Provider(creator, "sha1") { } Encryption::Context *CreateContext(Encryption::IV *iv) anope_override { diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp index cd0c06bde..832b3fdc1 100644 --- a/modules/encryption/enc_sha256.cpp +++ b/modules/encryption/enc_sha256.cpp @@ -220,7 +220,7 @@ class SHA256Context : public Encryption::Context class SHA256Provider : public Encryption::Provider { public: - SHA256Provider(Module *creator) : Encryption::Provider(creator, "sha256") { } + SHA256Provider(Module *creator) : Encryption::Provider(creator, "sha256") { } Encryption::Context *CreateContext(Encryption::IV *iv) anope_override { diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp index 0aeda9ddc..974747ada 100644 --- a/modules/extra/m_ssl_gnutls.cpp +++ b/modules/extra/m_ssl_gnutls.cpp @@ -25,7 +25,7 @@ namespace GnuTLS { class X509CertCredentials; } class MySSLService : public SSLService { public: - MySSLService(Module *o, const Anope::string &n); + MySSLService(Module *o, const Anope::string &n); /** Initialize a socket to use SSL * @param s The socket @@ -44,7 +44,7 @@ class SSLSocketIO : public SocketIO SSLSocketIO(); /** Really receive something from the buffer - * @param s The socket + * @param s The socket * @param buf The buf to read to * @param sz How much to read * @return Number of bytes received diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp index ef87f708c..e8c0d402a 100644 --- a/modules/extra/m_ssl_openssl.cpp +++ b/modules/extra/m_ssl_openssl.cpp @@ -24,7 +24,7 @@ static SSL_CTX *server_ctx, *client_ctx; class MySSLService : public SSLService { public: - MySSLService(Module *o, const Anope::string &n); + MySSLService(Module *o, const Anope::string &n); /** Initialize a socket to use SSL * @param s The socket @@ -43,7 +43,7 @@ class SSLSocketIO : public SocketIO SSLSocketIO(); /** Really receive something from the buffer - * @param s The socket + * @param s The socket * @param buf The buf to read to * @param sz How much to read * @return Number of bytes received diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index daa9a50ba..ada32db6b 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -468,7 +468,7 @@ class TCPSocket : public ListenSocket class Client : public ClientSocket, public Timer, public ReplySocket { Manager *manager; - Packet *packet; + Packet *packet; unsigned char packet_buffer[524]; int length; @@ -495,7 +495,7 @@ class TCPSocket : public ListenSocket SocketEngine::Change(this, true, SF_WRITABLE); } - bool ProcessRead() anope_override + bool ProcessRead() anope_override { Log(LOG_DEBUG_2) << "Resolver: Reading from DNS TCP socket"; diff --git a/modules/m_proxyscan.cpp b/modules/m_proxyscan.cpp index bb84faa08..cc7599666 100644 --- a/modules/m_proxyscan.cpp +++ b/modules/m_proxyscan.cpp @@ -57,11 +57,11 @@ class ProxyConnect : public ConnectionSocket static ServiceReference akills; public: - static std::set proxies; + static std::set proxies; - ProxyCheck proxy; + ProxyCheck proxy; unsigned short port; - time_t created; + time_t created; ProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ConnectionSocket(), proxy(p), port(po), created(Anope::CurTime) diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 57c4e2a5a..330135ecb 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -426,7 +426,7 @@ class InspIRCd12Proto : public IRCDProto void SendSVSLogin(const Anope::string &uid, const Anope::string &acc, const Anope::string &vident, const Anope::string &vhost) anope_override { UplinkSocket::Message(Me) << "METADATA " << uid << " accountname :" << acc; - + if (!vident.empty()) UplinkSocket::Message(Me) << "ENCAP " << uid.substr(0, 3) << " CHGIDENT " << uid << " " << vident; if (!vhost.empty()) diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 7cf4bf255..1b6adda61 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -184,9 +184,9 @@ namespace InspIRCdExtban class AccountMatcher : public InspIRCdExtBan { public: - AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } + AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } bool Matches(User *u, const Entry *e) anope_override { @@ -200,46 +200,46 @@ namespace InspIRCdExtban class RealnameMatcher : public InspIRCdExtBan { public: - RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return Anope::Match(u->realname, real_mask); - } + RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return Anope::Match(u->realname, real_mask); + } }; class ServerMatcher : public InspIRCdExtBan { public: - ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return Anope::Match(u->server->GetName(), real_mask); - } + ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return Anope::Match(u->server->GetName(), real_mask); + } }; class FingerprintMatcher : public InspIRCdExtBan { public: - FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask); - } + FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask); + } }; class UnidentifiedMatcher : public InspIRCdExtBan @@ -251,8 +251,8 @@ namespace InspIRCdExtban bool Matches(User *u, const Entry *e) anope_override { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); return !u->Account() && Entry("BAN", real_mask).Matches(u); } }; diff --git a/modules/protocol/inspircd3.cpp b/modules/protocol/inspircd3.cpp index 0899f44eb..c26f0a56a 100644 --- a/modules/protocol/inspircd3.cpp +++ b/modules/protocol/inspircd3.cpp @@ -575,9 +575,9 @@ namespace InspIRCdExtban class AccountMatcher : public InspIRCdExtBan { public: - AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } + AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } bool Matches(User *u, const Entry *e) anope_override { @@ -591,46 +591,46 @@ namespace InspIRCdExtban class RealnameMatcher : public InspIRCdExtBan { public: - RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return Anope::Match(u->realname, real_mask); - } + RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return Anope::Match(u->realname, real_mask); + } }; class ServerMatcher : public InspIRCdExtBan { public: - ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return Anope::Match(u->server->GetName(), real_mask); - } + ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return Anope::Match(u->server->GetName(), real_mask); + } }; class FingerprintMatcher : public InspIRCdExtBan { public: - FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) - { - } - - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); - return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask); - } + FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c) + { + } + + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); + return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask); + } }; class UnidentifiedMatcher : public InspIRCdExtBan @@ -642,8 +642,8 @@ namespace InspIRCdExtban bool Matches(User *u, const Entry *e) anope_override { - const Anope::string &mask = e->GetMask(); - Anope::string real_mask = mask.substr(2); + const Anope::string &mask = e->GetMask(); + Anope::string real_mask = mask.substr(2); return !u->Account() && Entry("BAN", real_mask).Matches(u); } }; diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp index 0c9516973..89aaf0daf 100644 --- a/modules/protocol/ngircd.cpp +++ b/modules/protocol/ngircd.cpp @@ -116,7 +116,7 @@ class ngIRCdProto : public IRCDProto void SendLogout(User *u) anope_override { UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :"; - } + } /* SERVER name hop descript */ void SendServer(const Server *server) anope_override @@ -509,8 +509,8 @@ struct IRCDMessageServer : IRCDMessage * New directly linked server: * * SERVER tolsun.oulu.fi 1 :Experimental server - * New server tolsun.oulu.fi introducing itself - * and attempting to register. + * New server tolsun.oulu.fi introducing itself + * and attempting to register. * * params[0] = servername * params[1] = hop count @@ -519,10 +519,10 @@ struct IRCDMessageServer : IRCDMessage * New remote server in the network: * * :tolsun.oulu.fi SERVER csd.bu.edu 5 34 :BU Central Server - * Server tolsun.oulu.fi is our uplink for csd.bu.edu - * which is 5 hops away. The token "34" will be used - * by tolsun.oulu.fi when introducing new users or - * services connected to csd.bu.edu. + * Server tolsun.oulu.fi is our uplink for csd.bu.edu + * which is 5 hops away. The token "34" will be used + * by tolsun.oulu.fi when introducing new users or + * services connected to csd.bu.edu. * * params[0] = servername * params[1] = hop count diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 706cf7d0f..99c382e78 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -482,11 +482,11 @@ namespace UnrealExtban class EntryMatcher : public UnrealExtBan { public: - EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); @@ -498,11 +498,11 @@ namespace UnrealExtban class RealnameMatcher : public UnrealExtBan { public: - RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); @@ -514,11 +514,11 @@ namespace UnrealExtban class RegisteredMatcher : public UnrealExtBan { public: - RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); return u->HasMode("REGISTERED") && mask.equals_ci(u->nick); @@ -528,17 +528,17 @@ namespace UnrealExtban class AccountMatcher : public UnrealExtBan { public: - AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); - return u->Account() && Anope::Match(u->Account()->display, real_mask); - } + return u->Account() && Anope::Match(u->Account()->display, real_mask); + } }; } diff --git a/modules/protocol/unreal4.cpp b/modules/protocol/unreal4.cpp index f48981739..9089857ac 100644 --- a/modules/protocol/unreal4.cpp +++ b/modules/protocol/unreal4.cpp @@ -497,11 +497,11 @@ namespace UnrealExtban class EntryMatcher : public UnrealExtBan { public: - EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); @@ -513,11 +513,11 @@ namespace UnrealExtban class RealnameMatcher : public UnrealExtBan { public: - RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); @@ -529,11 +529,11 @@ namespace UnrealExtban class RegisteredMatcher : public UnrealExtBan { public: - RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->GetMask(); return u->HasMode("REGISTERED") && mask.equals_ci(u->nick); @@ -543,17 +543,17 @@ namespace UnrealExtban class AccountMatcher : public UnrealExtBan { public: - AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) - { - } + AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c) + { + } - bool Matches(User *u, const Entry *e) anope_override - { - const Anope::string &mask = e->GetMask(); + bool Matches(User *u, const Entry *e) anope_override + { + const Anope::string &mask = e->GetMask(); Anope::string real_mask = mask.substr(3); - return u->Account() && Anope::Match(u->Account()->display, real_mask); - } + return u->Account() && Anope::Match(u->Account()->display, real_mask); + } }; class FingerprintMatcher : public UnrealExtBan diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp index 2344f45d5..b532df707 100644 --- a/modules/pseudoclients/chanserv.cpp +++ b/modules/pseudoclients/chanserv.cpp @@ -45,7 +45,7 @@ class ChanServCore : public Module, public ChanServService Reference c; public: - /** Constructor + /** Constructor * @param chan The channel */ ChanServTimer(Reference &cs, ExtensibleItem &i, Module *m, Channel *chan) : Timer(m, Config->GetModule(m)->Get("inhabit", "15s")), ChanServ(cs), inhabit(i), c(chan) diff --git a/modules/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h index 541126e84..97072e45d 100644 --- a/modules/webcpanel/pages/chanserv/access.h +++ b/modules/webcpanel/pages/chanserv/access.h @@ -14,7 +14,7 @@ namespace ChanServ class Access : public WebPanelProtectedPage { public: - Access(const Anope::string &cat, const Anope::string &u); + Access(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; diff --git a/modules/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h index d041bd46b..6ebbfafd4 100644 --- a/modules/webcpanel/pages/chanserv/akick.h +++ b/modules/webcpanel/pages/chanserv/akick.h @@ -14,7 +14,7 @@ namespace ChanServ class Akick : public WebPanelProtectedPage { public: - Akick(const Anope::string &cat, const Anope::string &u); + Akick(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; diff --git a/modules/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h index 2af7e86b0..51b186b19 100644 --- a/modules/webcpanel/pages/chanserv/info.h +++ b/modules/webcpanel/pages/chanserv/info.h @@ -14,7 +14,7 @@ namespace ChanServ class Info : public WebPanelProtectedPage { public: - Info(const Anope::string &cat, const Anope::string &u); + Info(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h index 75131b8ac..7ec6d3137 100644 --- a/modules/webcpanel/pages/chanserv/set.h +++ b/modules/webcpanel/pages/chanserv/set.h @@ -14,7 +14,7 @@ namespace ChanServ class Set : public WebPanelProtectedPage { public: - Set(const Anope::string &cat, const Anope::string &u); + Set(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; diff --git a/modules/webcpanel/pages/hostserv/request.h b/modules/webcpanel/pages/hostserv/request.h index ea2a61f19..3d3ab5c8a 100644 --- a/modules/webcpanel/pages/hostserv/request.h +++ b/modules/webcpanel/pages/hostserv/request.h @@ -14,7 +14,7 @@ namespace HostServ class Request : public WebPanelProtectedPage { public: - Request(const Anope::string &cat, const Anope::string &u); + Request(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/logout.h b/modules/webcpanel/pages/logout.h index cfb93b8f5..787d4876f 100644 --- a/modules/webcpanel/pages/logout.h +++ b/modules/webcpanel/pages/logout.h @@ -11,7 +11,7 @@ namespace WebCPanel class Logout : public WebPanelProtectedPage { public: - Logout(const Anope::string &u); + Logout(const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memos.h index c80f87879..e5981ac95 100644 --- a/modules/webcpanel/pages/memoserv/memos.h +++ b/modules/webcpanel/pages/memoserv/memos.h @@ -14,7 +14,7 @@ namespace MemoServ class Memos : public WebPanelProtectedPage { public: - Memos(const Anope::string &cat, const Anope::string &u); + Memos(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/nickserv/access.h b/modules/webcpanel/pages/nickserv/access.h index ebf8f1da9..9b2198cca 100644 --- a/modules/webcpanel/pages/nickserv/access.h +++ b/modules/webcpanel/pages/nickserv/access.h @@ -14,7 +14,7 @@ namespace NickServ class Access : public WebPanelProtectedPage { public: - Access(const Anope::string &cat, const Anope::string &u); + Access(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h index 94f898b9f..6263985fd 100644 --- a/modules/webcpanel/pages/nickserv/alist.h +++ b/modules/webcpanel/pages/nickserv/alist.h @@ -14,7 +14,7 @@ namespace NickServ class Alist : public WebPanelProtectedPage { public: - Alist(const Anope::string &cat, const Anope::string &u); + Alist(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h index ba5307821..521ce4ac4 100644 --- a/modules/webcpanel/pages/nickserv/cert.h +++ b/modules/webcpanel/pages/nickserv/cert.h @@ -14,7 +14,7 @@ namespace NickServ class Cert : public WebPanelProtectedPage { public: - Cert(const Anope::string &cat, const Anope::string &u); + Cert(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; diff --git a/modules/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h index 883e9e3ce..0c8a5b3d6 100644 --- a/modules/webcpanel/pages/nickserv/info.h +++ b/modules/webcpanel/pages/nickserv/info.h @@ -14,7 +14,7 @@ namespace NickServ class Info : public WebPanelProtectedPage { public: - Info(const Anope::string &cat, const Anope::string &u); + Info(const Anope::string &cat, const Anope::string &u); bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override; }; -- cgit