X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=eba40ee0c803dae8cea8108591e8a7d59ea2488e;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=3313b47f5815e9d235e40e7761000fc09d7e1f94;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 3313b47f5..eba40ee0c 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,16 +1,16 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. + * E-mail: + * + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - *the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -24,9 +24,14 @@ #include "modules.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "commands.h" +#include "configreader.h" +#include "inspircd.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ + + class CBan : public classbase { public: @@ -58,14 +63,11 @@ cbanlist cbans; class cmd_cban : public command_t { - private: - Server *Srv; - public: - cmd_cban(Server* Me) : command_t("CBAN", 'o', 1) + cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1) { this->source = "m_cban.so"; - this->Srv = Me; + this-> syntax = " [ :]"; } @@ -93,12 +95,12 @@ class cmd_cban : public command_t else if (pcnt >= 2) { /* full form to add a CBAN */ - if (IsValidChannelName(parameters[0])) + if (ServerInstance->IsChannel(parameters[0])) { // parameters[0] = #channel // parameters[1] = 1h3m2s // parameters[2] = Tortoise abuser - long length = Srv->CalcDuration(parameters[1]); + long length = duration(parameters[1]); std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason)); @@ -108,12 +110,12 @@ class cmd_cban : public command_t if(length > 0) { user->WriteServ( "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); - WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); } else { user->WriteServ( "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str()); - WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); + ServerInstance->WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); } } else @@ -124,17 +126,22 @@ class cmd_cban : public command_t } }; +bool CBanComp(const CBan &ban1, const CBan &ban2) +{ + return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); +} + class ModuleCBan : public Module { cmd_cban* mycommand; - Server* Srv; + public: - ModuleCBan(Server* Me) : Module::Module(Me) + ModuleCBan(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - mycommand = new cmd_cban(Srv); - Srv->AddCommand(mycommand); + + mycommand = new cmd_cban(Me); + ServerInstance->AddCommand(mycommand); } void Implements(char* List) @@ -151,7 +158,7 @@ class ModuleCBan : public Module for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { unsigned long remaining = (iter->set_on + iter->length) - TIME; - results.push_back(Srv->GetServerName()+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason); + results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason); } } @@ -169,7 +176,7 @@ class ModuleCBan : public Module { // Channel is banned. user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); - WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); + ServerInstance->WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); return 1; } } @@ -201,60 +208,55 @@ class ModuleCBan : public Module { return Version(1,0,0,1,VF_VENDOR); } -}; -std::string EncodeCBan(const CBan &ban) -{ - std::ostringstream stream; - stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; - return stream.str(); -} + std::string EncodeCBan(const CBan &ban) + { + std::ostringstream stream; + stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; + return stream.str(); + } -CBan DecodeCBan(const std::string &data) -{ - CBan res; - std::istringstream stream(data); - stream >> res.chname; - stream >> res.set_by; - stream >> res.set_on; - stream >> res.length; - res.reason = stream.str(); + CBan DecodeCBan(const std::string &data) + { + CBan res; + std::istringstream stream(data); + stream >> res.chname; + stream >> res.set_by; + stream >> res.set_on; + stream >> res.length; + res.reason = stream.str(); - return res; -} - -bool CBanComp(const CBan &ban1, const CBan &ban2) -{ - return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); -} - -void ExpireBans() -{ - bool go_again = true; + return res; + } - while (go_again) + void ExpireBans() { - go_again = false; + bool go_again = true; - for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + while (go_again) { - /* 0 == permanent, don't mess with them! -- w00t */ - if (iter->length != 0) + go_again = false; + + for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { - if (iter->set_on + iter->length <= TIME) + /* 0 == permanent, don't mess with them! -- w00t */ + if (iter->length != 0) { - log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); - WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); - cbans.erase(iter); - go_again = true; + if (iter->set_on + iter->length <= TIME) + { + log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); + ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); + cbans.erase(iter); + go_again = true; + } } + + if (go_again == true) + break; } - - if (go_again == true) - break; } } -} +}; class ModuleCBanFactory : public ModuleFactory { @@ -267,7 +269,7 @@ class ModuleCBanFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCBan(Me); }