X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=2f57a966c4626f5dcca2cf02634dc7e1cf92f1ca;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=3d38affabcc5f707cd01cc1ba09c89fce5b44834;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 3d38affab..2f57a966c 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,35 +2,26 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - /* $ModDesc: Adds timed bans */ -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" #include "hashcomp.h" #include "configreader.h" -#include "inspircd.h" - - -extern InspIRCd* ServerInstance; +/** Holds a timed ban + */ class TimedBan : public classbase { public: @@ -42,6 +33,8 @@ class TimedBan : public classbase typedef std::vector timedbans; timedbans TimedBanList; +/** Handle /TBAN + */ class cmd_tban : public command_t { public: @@ -51,7 +44,7 @@ class cmd_tban : public command_t syntax = " "; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { chanrec* channel = ServerInstance->FindChan(parameters[0]); if (channel) @@ -62,26 +55,25 @@ class cmd_tban : public command_t if (!ServerInstance->IsValidMask(parameters[2])) { user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); - return; + return CMD_FAILURE; } for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { if (!strcasecmp(i->data,parameters[2])) { user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); - return; + return CMD_FAILURE; } } TimedBan T; std::string channelname = parameters[0]; - unsigned long expire = ServerInstance->CalcDuration(parameters[1]) + time(NULL); - if (ServerInstance->CalcDuration(parameters[1]) < 1) + long duration = ServerInstance->Duration(parameters[1]); + unsigned long expire = duration + time(NULL); + if (duration < 1) { user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); - return; + return CMD_FAILURE; } - char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",ServerInstance->CalcDuration(parameters[1])); std::string mask = parameters[2]; const char *setban[32]; setban[0] = parameters[0]; @@ -101,14 +93,16 @@ class cmd_tban : public command_t T.mask = mask; T.expire = expire; TimedBanList.push_back(T); - channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration); + channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration); + return CMD_SUCCESS; } - return; + return CMD_FAILURE; } else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); - return; + return CMD_FAILURE; } user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); + return CMD_FAILURE; } }; @@ -117,7 +111,7 @@ class ModuleTimedBans : public Module cmd_tban* mycommand; public: ModuleTimedBans(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { mycommand = new cmd_tban(ServerInstance); @@ -137,11 +131,13 @@ class ModuleTimedBans : public Module virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask) { + irc::string listitem = banmask.c_str(); + irc::string thischan = chan->name; for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) { - irc::string listitem = banmask.c_str(); irc::string target = i->mask.c_str(); - if (listitem == target) + irc::string tchan = i->channel.c_str(); + if ((listitem == target) && (tchan == thischan)) { TimedBanList.erase(i); break; @@ -175,16 +171,15 @@ class ModuleTimedBans : public Module // hash and set its descriptor to FD_MAGIC_NUMBER so the data // falls into the abyss :p userrec* temp = new userrec(ServerInstance); - temp->fd = FD_MAGIC_NUMBER; - temp->server = ""; + temp->SetFd(FD_MAGIC_NUMBER); + /* FIX: Send mode remotely*/ + std::deque n; + n.push_back(setban[0]); + n.push_back("-b"); + n.push_back(setban[2]); ServerInstance->SendMode(setban,3,temp); - /* FIX: Send mode remotely*/ - std::deque n; - n.push_back(i->channel); - n.push_back("-b"); - n.push_back(i->mask); - Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(); + Event rmode((char *)&n, NULL, "send_mode"); + rmode.Send(ServerInstance); DELETE(temp); } else @@ -201,7 +196,7 @@ class ModuleTimedBans : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } }; @@ -225,7 +220,7 @@ class ModuleTimedBansFactory : public ModuleFactory }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleTimedBansFactory; }