X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=b6e197c2f0c89b5790f4c8233584022fc7a3f0de;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=10193a2ad992a6b0bfa079abd6dcaa9ea828ff96;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 10193a2ad..b6e197c2f 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,37 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * 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. * * --------------------------------------------------- */ +#include "inspircd.h" #include -#include -#include -#include #include "users.h" #include "channels.h" #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. */ -extern InspIRCd* ServerInstance; - +/** Holds a CBAN item + */ class CBan : public classbase { public: @@ -50,17 +40,15 @@ public: } }; -std::string EncodeCBan(const CBan &ban); -CBan DecodeCBan(const std::string &data); bool CBanComp(const CBan &ban1, const CBan &ban2); -void ExpireBans(); -extern time_t TIME; typedef std::vector cbanlist; /* cbans is declared here, as our type is right above. Don't try move it. */ cbanlist cbans; +/** Handle /CBAN + */ class cmd_cban : public command_t { public: @@ -71,12 +59,10 @@ class cmd_cban : public command_t syntax = " [ :]"; } - void Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, userrec *user) { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ - - ExpireBans(); if(pcnt == 1) { @@ -85,7 +71,7 @@ class cmd_cban : public command_t { if (parameters[0] == iter->chname) { - unsigned long remaining = (iter->set_on + iter->length) - TIME; + unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); user->WriteServ( "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str()); cbans.erase(iter); break; @@ -100,10 +86,10 @@ class cmd_cban : public command_t // parameters[0] = #channel // parameters[1] = 1h3m2s // parameters[2] = Tortoise abuser - long length = duration(parameters[1]); + long length = ServerInstance->Duration(parameters[1]); std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason)); + cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason)); std::sort(cbans.begin(), cbans.end(), CBanComp); @@ -121,18 +107,27 @@ class cmd_cban : public command_t else { user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]); + return CMD_FAILURE; } } + + /* we want this routed! */ + return CMD_SUCCESS; } }; +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; public: - ModuleCBan(InspIRCd* Me) : Module::Module(Me) + ModuleCBan(InspIRCd* Me) : Module(Me) { mycommand = new cmd_cban(Me); @@ -152,7 +147,7 @@ class ModuleCBan : public Module { for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { - unsigned long remaining = (iter->set_on + iter->length) - TIME; + unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); 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); } } @@ -160,7 +155,7 @@ class ModuleCBan : public Module return 0; } - virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname) + virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs) { ExpireBans(); @@ -178,7 +173,7 @@ class ModuleCBan : public Module return 0; } - virtual void OnSyncOtherMetaData(Module* proto, void* opaque) + virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { @@ -201,62 +196,56 @@ class ModuleCBan : public Module virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version(1,1,0,1,VF_VENDOR,API_VERSION); } -}; -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()); - 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 (iter->set_on + iter->length <= ServerInstance->Time()) + { + ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->Time() - iter->set_on); + cbans.erase(iter); + go_again = true; + } } + + if (go_again == true) + break; } - - if (go_again == true) - break; } } -} +}; class ModuleCBanFactory : public ModuleFactory { @@ -277,7 +266,7 @@ class ModuleCBanFactory : public ModuleFactory }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleCBanFactory; }