From ce9b1289c672d3d6b9cadec865754710bc1b80f7 Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 28 Oct 2007 18:44:49 +0000 Subject: PERL PIE FOR ALL: Rename a fuckload of XLineManager's methods git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8399 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/xline.h | 22 +++++++------- src/commands/cmd_eline.cpp | 4 +-- src/commands/cmd_gline.cpp | 6 ++-- src/commands/cmd_kline.cpp | 6 ++-- src/commands/cmd_qline.cpp | 6 ++-- src/commands/cmd_zline.cpp | 6 ++-- src/modules/m_antibear.cpp | 4 +-- src/modules/m_dnsbl.cpp | 12 ++++---- src/modules/m_filter.h | 8 ++--- src/modules/m_spanningtree/treesocket2.cpp | 18 +++++------ src/userprocess.cpp | 4 +-- src/xline.cpp | 48 +++++++++++++++--------------- 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/include/xline.h b/include/xline.h index 12b60ee6c..038403a23 100644 --- a/include/xline.h +++ b/include/xline.h @@ -324,7 +324,7 @@ class CoreExport XLineManager * @param hostmask The hostmask * @return True if the line was added successfully */ - bool add_gline(long duration, const char* source, const char* reason, const char* hostmask); + bool AddGLine(long duration, const char* source, const char* reason, const char* hostmask); /** Add a new QLine * @param duration The duration of the line @@ -333,7 +333,7 @@ class CoreExport XLineManager * @param nickname The nickmask * @return True if the line was added successfully */ - bool add_qline(long duration, const char* source, const char* reason, const char* nickname); + bool AddQLine(long duration, const char* source, const char* reason, const char* nickname); /** Add a new ZLine * @param duration The duration of the line @@ -342,7 +342,7 @@ class CoreExport XLineManager * @param ipaddr The IP mask * @return True if the line was added successfully */ - bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr); + bool AddZLine(long duration, const char* source, const char* reason, const char* ipaddr); /** Add a new KLine * @param duration The duration of the line @@ -351,7 +351,7 @@ class CoreExport XLineManager * @param hostmask The hostmask * @return True if the line was added successfully */ - bool add_kline(long duration, const char* source, const char* reason, const char* hostmask); + bool AddKLine(long duration, const char* source, const char* reason, const char* hostmask); /** Add a new ELine * @param duration The duration of the line @@ -360,42 +360,42 @@ class CoreExport XLineManager * @param hostmask The hostmask * @return True if the line was added successfully */ - bool add_eline(long duration, const char* source, const char* reason, const char* hostmask); + bool AddELine(long duration, const char* source, const char* reason, const char* hostmask); /** Delete a GLine * @param hostmask The host to remove * @param simulate If this is true, don't actually remove the line, just return * @return True if the line was deleted successfully */ - bool del_gline(const char* hostmask, bool simulate = false); + bool DelGLine(const char* hostmask, bool simulate = false); /** Delete a QLine * @param nickname The nick to remove * @param simulate If this is true, don't actually remove the line, just return * @return True if the line was deleted successfully */ - bool del_qline(const char* nickname, bool simulate = false); + bool DelQLine(const char* nickname, bool simulate = false); /** Delete a ZLine * @param ipaddr The IP to remove * @param simulate If this is true, don't actually remove the line, just return * @return True if the line was deleted successfully */ - bool del_zline(const char* ipaddr, bool simulate = false); + bool DelZLine(const char* ipaddr, bool simulate = false); /** Delete a KLine * @param hostmask The host to remove * @param simulate If this is true, don't actually remove the line, just return * @return True if the line was deleted successfully */ - bool del_kline(const char* hostmask, bool simulate = false); + bool DelKLine(const char* hostmask, bool simulate = false); /** Delete a ELine * @param hostmask The host to remove * @param simulate If this is true, don't actually remove the line, just return * @return True if the line was deleted successfully */ - bool del_eline(const char* hostmask, bool simulate = false); + bool DelELine(const char* hostmask, bool simulate = false); /** Check if a nickname matches a QLine * @return nick The nick to check against @@ -433,7 +433,7 @@ class CoreExport XLineManager /** Apply any new lines that are pending to be applied */ - void apply_lines(); + void ApplyLines(); /** Handle /STATS K * @param user The username making the query diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp index bd9832c8a..2b1f8d803 100644 --- a/src/commands/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp @@ -37,7 +37,7 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) } long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_eline(duration,user->nick,parameters[2],parameters[0])) + if (ServerInstance->XLines->AddELine(duration,user->nick,parameters[2],parameters[0])) { FOREACH_MOD(I_OnAddELine,OnAddELine(duration, user, parameters[2], parameters[0])); @@ -59,7 +59,7 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) } else { - if (ServerInstance->XLines->del_eline(parameters[0])) + if (ServerInstance->XLines->DelELine(parameters[0])) { FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0])); ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]); diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp index 411df7b14..e254ac6ed 100644 --- a/src/commands/cmd_gline.cpp +++ b/src/commands/cmd_gline.cpp @@ -42,7 +42,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user) } long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_gline(duration,user->nick,parameters[2],parameters[0])) + if (ServerInstance->XLines->AddGLine(duration,user->nick,parameters[2],parameters[0])) { FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0])); @@ -57,7 +57,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user) ServerInstance->TimeString(c_requires_crap).c_str()); } - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); } else { @@ -67,7 +67,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user) } else { - if (ServerInstance->XLines->del_gline(parameters[0])) + if (ServerInstance->XLines->DelGLine(parameters[0])) { FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0])); ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]); diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp index 521159790..14cd552ec 100644 --- a/src/commands/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp @@ -42,7 +42,7 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) } long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],parameters[0])) + if (ServerInstance->XLines->AddKLine(duration,user->nick,parameters[2],parameters[0])) { FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0])); @@ -57,7 +57,7 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) ServerInstance->TimeString(c_requires_crap).c_str()); } - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); } else { @@ -66,7 +66,7 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) } else { - if (ServerInstance->XLines->del_kline(parameters[0])) + if (ServerInstance->XLines->DelKLine(parameters[0])) { FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0])); ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]); diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp index 01f99546b..e32641e82 100644 --- a/src/commands/cmd_qline.cpp +++ b/src/commands/cmd_qline.cpp @@ -36,7 +36,7 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user) } long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_qline(duration,user->nick,parameters[2],parameters[0])) + if (ServerInstance->XLines->AddQLine(duration,user->nick,parameters[2],parameters[0])) { FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration, user, parameters[2], parameters[0])); if (!duration) @@ -49,7 +49,7 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user) ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0], ServerInstance->TimeString(c_requires_crap).c_str()); } - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); } else { @@ -58,7 +58,7 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user) } else { - if (ServerInstance->XLines->del_qline(parameters[0])) + if (ServerInstance->XLines->DelQLine(parameters[0])) { FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0])); ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]); diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp index 7e5d9b7b2..9789830ef 100644 --- a/src/commands/cmd_zline.cpp +++ b/src/commands/cmd_zline.cpp @@ -36,7 +36,7 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user) return CMD_FAILURE; long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0])) + if (ServerInstance->XLines->AddZLine(duration,user->nick,parameters[2],parameters[0])) { FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0])); if (!duration) @@ -49,7 +49,7 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user) ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0], ServerInstance->TimeString(c_requires_crap).c_str()); } - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); } else { @@ -58,7 +58,7 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user) } else { - if (ServerInstance->XLines->del_zline(parameters[0])) + if (ServerInstance->XLines->DelZLine(parameters[0])) { FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0])); ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]); diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp index 3fced6079..f18aa6883 100644 --- a/src/modules/m_antibear.cpp +++ b/src/modules/m_antibear.cpp @@ -46,10 +46,10 @@ class ModuleAntiBear : public Module { if (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30)) { - ServerInstance->XLines->add_zline(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString()); + ServerInstance->XLines->AddZLine(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString()); // XXX move events into the damn XLineManager stuff FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP())); - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); return 1; } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 1d99943d5..3c2d18e75 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -115,25 +115,25 @@ class DNSBLResolver : public Resolver { std::string ban = std::string("*@") + them->GetIPString(); if (show) - ServerInstance->XLines->apply_lines(); - show = ServerInstance->XLines->add_kline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str()); + ServerInstance->XLines->ApplyLines(); + show = ServerInstance->XLines->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str()); FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, ban)); break; } case DNSBLConfEntry::I_GLINE: { std::string ban = std::string("*@") + them->GetIPString(); - show = ServerInstance->XLines->add_gline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str()); + show = ServerInstance->XLines->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str()); if (show) - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, ban)); break; } case DNSBLConfEntry::I_ZLINE: { - show = ServerInstance->XLines->add_zline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString()); + show = ServerInstance->XLines->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString()); if (show) - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString())); break; } diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h index f88657ee8..1b65623c5 100644 --- a/src/modules/m_filter.h +++ b/src/modules/m_filter.h @@ -280,9 +280,9 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri } if (f->action == "gline") { - if (ServerInstance->XLines->add_gline(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), user->MakeHostIP())) + if (ServerInstance->XLines->AddGLine(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), user->MakeHostIP())) { - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP())); } } @@ -368,9 +368,9 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters std::string wild = "*@"; wild.append(user->GetIPString()); - if (ServerInstance->XLines->add_gline(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), wild.c_str())) + if (ServerInstance->XLines->AddGLine(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), wild.c_str())) { - ServerInstance->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP())); } } diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index d8eab8a5e..e1d320051 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -528,23 +528,23 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque &par switch (*(params[0].c_str())) { case 'Z': - propogate = Instance->XLines->add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + propogate = Instance->XLines->AddZLine(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); Instance->XLines->zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'Q': - propogate = Instance->XLines->add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + propogate = Instance->XLines->AddQLine(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); Instance->XLines->qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'E': - propogate = Instance->XLines->add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + propogate = Instance->XLines->AddELine(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); Instance->XLines->eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'G': - propogate = Instance->XLines->add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + propogate = Instance->XLines->AddGLine(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); Instance->XLines->gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'K': - propogate = Instance->XLines->add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + propogate = Instance->XLines->AddKLine(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); break; default: /* Just in case... */ @@ -570,7 +570,7 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque &par if (!this->bursting) { - Instance->XLines->apply_lines(); + Instance->XLines->ApplyLines(); } return true; @@ -1340,7 +1340,7 @@ bool TreeSocket::ProcessLine(std::string &line) if (this->bursting) { this->bursting = false; - Instance->XLines->apply_lines(); + Instance->XLines->ApplyLines(); } return this->LocalPing(prefix,params); @@ -1359,7 +1359,7 @@ bool TreeSocket::ProcessLine(std::string &line) if (this->bursting) { this->bursting = false; - Instance->XLines->apply_lines(); + Instance->XLines->ApplyLines(); } return this->LocalPong(prefix,params); @@ -1477,7 +1477,7 @@ bool TreeSocket::ProcessLine(std::string &line) else if (command == "ENDBURST") { this->bursting = false; - Instance->XLines->apply_lines(); + Instance->XLines->ApplyLines(); std::string sourceserv = this->myhost; if (!this->InboundServerName.empty()) sourceserv = this->InboundServerName; diff --git a/src/userprocess.cpp b/src/userprocess.cpp index d2c481fbb..066800409 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -29,8 +29,8 @@ void FloodQuitUserHandler::Call(User* current) if (current->registered != REG_ALL) { - Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); - Server->XLines->apply_lines(); + Server->XLines->AddZLine(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); + Server->XLines->ApplyLines(); } } diff --git a/src/xline.cpp b/src/xline.cpp index 4022a27a8..e29d019e7 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -71,28 +71,28 @@ bool InitXLine(ServerConfig* conf, const char* tag) bool DoneZLine(ServerConfig* conf, const char* tag) { // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->apply_lines(); + conf->GetInstance()->XLines->ApplyLines(); return true; } bool DoneQLine(ServerConfig* conf, const char* tag) { // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->apply_lines(); + conf->GetInstance()->XLines->ApplyLines(); return true; } bool DoneKLine(ServerConfig* conf, const char* tag) { // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->apply_lines(); + conf->GetInstance()->XLines->ApplyLines(); return true; } bool DoneELine(ServerConfig* conf, const char* tag) { // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->apply_lines(); + conf->GetInstance()->XLines->ApplyLines(); return true; } @@ -101,7 +101,7 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val const char* reason = values[0].GetString(); const char* ipmask = values[1].GetString(); - conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); + conf->GetInstance()->XLines->AddZLine(0,"",reason,ipmask); return true; } @@ -110,7 +110,7 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val const char* reason = values[0].GetString(); const char* nick = values[1].GetString(); - conf->GetInstance()->XLines->add_qline(0,"",reason,nick); + conf->GetInstance()->XLines->AddQLine(0,"",reason,nick); return true; } @@ -119,7 +119,7 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - conf->GetInstance()->XLines->add_kline(0,"",reason,host); + conf->GetInstance()->XLines->AddKLine(0,"",reason,host); return true; } @@ -128,7 +128,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - conf->GetInstance()->XLines->add_eline(0,"",reason,host); + conf->GetInstance()->XLines->AddELine(0,"",reason,host); return true; } @@ -155,11 +155,11 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) // adds a g:line -bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - if (del_gline(hostmask, true)) + if (DelGLine(hostmask, true)) return false; GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -172,11 +172,11 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso // adds an e:line (exception to bans) -bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - if (del_eline(hostmask, true)) + if (DelELine(hostmask, true)) return false; ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -189,9 +189,9 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas // adds a q:line -bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) +bool XLineManager::AddQLine(long duration, const char* source, const char* reason, const char* nickname) { - if (del_qline(nickname, true)) + if (DelQLine(nickname, true)) return false; QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); @@ -204,7 +204,7 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas // adds a z:line -bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr) { if (strchr(ipaddr,'@')) { @@ -213,7 +213,7 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas ipaddr++; } - if (del_zline(ipaddr, true)) + if (DelZLine(ipaddr, true)) return false; ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); @@ -226,11 +226,11 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas // adds a k:line -bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - if (del_kline(hostmask, true)) + if (DelKLine(hostmask, true)) return false; KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -243,7 +243,7 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas // deletes a g:line, returns true if the line existed and was removed -bool XLineManager::del_gline(const char* hostmask, bool simulate) +bool XLineManager::DelGLine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) @@ -264,7 +264,7 @@ bool XLineManager::del_gline(const char* hostmask, bool simulate) // deletes a e:line, returns true if the line existed and was removed -bool XLineManager::del_eline(const char* hostmask, bool simulate) +bool XLineManager::DelELine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) @@ -285,7 +285,7 @@ bool XLineManager::del_eline(const char* hostmask, bool simulate) // deletes a q:line, returns true if the line existed and was removed -bool XLineManager::del_qline(const char* nickname, bool simulate) +bool XLineManager::DelQLine(const char* nickname, bool simulate) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { @@ -305,7 +305,7 @@ bool XLineManager::del_qline(const char* nickname, bool simulate) // deletes a z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr, bool simulate) +bool XLineManager::DelZLine(const char* ipaddr, bool simulate) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { @@ -325,7 +325,7 @@ bool XLineManager::del_zline(const char* ipaddr, bool simulate) // deletes a k:line, returns true if the line existed and was removed -bool XLineManager::del_kline(const char* hostmask, bool simulate) +bool XLineManager::DelKLine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) @@ -552,7 +552,7 @@ void XLineManager::expire_lines() // applies lines, removing clients and changing nicks etc as applicable -void XLineManager::apply_lines() +void XLineManager::ApplyLines() { int What = 0; // XXX remove me char reason[MAXBUF]; -- cgit v1.2.3