* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 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 <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
+#include "inspircd.h"
-Server *Srv;
-
-class TimedBan
+/** Holds a timed ban
+ */
+class TimedBan : public classbase
{
public:
std::string channel;
typedef std::vector<TimedBan> timedbans;
timedbans TimedBanList;
-class cmd_tban : public command_t
+/** Handle /TBAN
+ */
+class CommandTban : public Command
{
public:
- cmd_tban () : command_t("TBAN", 0, 3)
+ CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
{
- this->source = "m_timedbans,cpp";
+ this->source = "m_timedbans.so";
+ syntax = "<channel> <duration> <banmask>";
+ TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
}
- void Handle (char **parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char* const* parameters, int pcnt, User *user)
{
- chanrec* channel = Srv->FindChannel(parameters[0]);
+ Channel* channel = ServerInstance->FindChan(parameters[0]);
if (channel)
{
- std::string cm = Srv->ChanMode(user,channel);
- if ((cm == "%") || (cm == "@"))
+ int cm = channel->GetStatus(user);
+ if ((cm == STATUS_HOP) || (cm == STATUS_OP))
{
- if (!Srv->IsValidMask(parameters[2]))
+ if (!ServerInstance->IsValidMask(parameters[2]))
{
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask");
- return;
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
+ return CMD_FAILURE;
}
- for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+ for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
{
- irc::string listitem = i->mask.c_str();
- irc::string target = parameters[2];
- irc::string listchan = i->channel.c_str();
- irc::string targetchan = parameters[0];
- if ((listitem == target) && (listchan == targetchan))
+ if (!strcasecmp(i->data,parameters[2]))
{
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
- return;
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
+ return CMD_FAILURE;
}
}
TimedBan T;
std::string channelname = parameters[0];
- unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL);
- if (Srv->CalcDuration(parameters[1]) < 1)
+ long duration = ServerInstance->Duration(parameters[1]);
+ unsigned long expire = duration + time(NULL);
+ if (duration < 1)
{
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time");
- return;
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
+ return CMD_FAILURE;
}
- char duration[MAXBUF];
- snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1]));
std::string mask = parameters[2];
- char *setban[3];
+ const char *setban[32];
setban[0] = parameters[0];
setban[1] = "+b";
setban[2] = parameters[2];
// use CallCommandHandler to make it so that the user sets the mode
// themselves
- Srv->CallCommandHandler("MODE",setban,3,user);
- T.channel = channelname;
- T.mask = mask;
- T.expire = expire;
- TimedBanList.push_back(T);
- Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds.");
- return;
+ ServerInstance->CallCommandHandler("MODE",setban,3,user);
+ /* Check if the ban was actually added (e.g. banlist was NOT full) */
+ bool was_added = false;
+ for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
+ if (!strcasecmp(i->data,mask.c_str()))
+ was_added = true;
+ if (was_added)
+ {
+ CUList tmp;
+ T.channel = channelname;
+ T.mask = mask;
+ T.expire = expire;
+ TimedBanList.push_back(T);
+ channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+ channel->WriteAllExcept(user, true, '%', tmp, "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 CMD_FAILURE;
}
- else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
- return;
+ else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name,
+ ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
+ return CMD_FAILURE;
}
- WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+ user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
+ return CMD_FAILURE;
}
};
class ModuleTimedBans : public Module
{
- cmd_tban* mycommand;
+ CommandTban* mycommand;
public:
- ModuleTimedBans(Server* Me)
- : Module::Module(Me)
+ ModuleTimedBans(InspIRCd* Me)
+ : Module(Me)
{
- Srv = Me;
- mycommand = new cmd_tban();
- Srv->AddCommand(mycommand);
+
+ mycommand = new CommandTban(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
TimedBanList.clear();
+ Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual ~ModuleTimedBans()
TimedBanList.clear();
}
- virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask)
+
+ virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
{
- 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)
- {
- TimedBanList.erase(i);
- break;
- }
- }
+ irc::string listitem = banmask.c_str();
+ irc::string thischan = chan->name;
+ for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+ {
+ irc::string target = i->mask.c_str();
+ irc::string tchan = i->channel.c_str();
+ if ((listitem == target) && (tchan == thischan))
+ {
+ TimedBanList.erase(i);
+ break;
+ }
+ }
return 0;
}
{
if (curtime > i->expire)
{
- chanrec* cr = Srv->FindChannel(i->channel);
+ Channel* cr = ServerInstance->FindChan(i->channel);
again = true;
if (cr)
{
- Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired.");
- char *setban[3];
- setban[0] = (char*)i->channel.c_str();
+ const char *setban[3];
+ setban[0] = i->channel.c_str();
setban[1] = "-b";
- setban[2] = (char*)i->mask.c_str();
- // kludge alert!
- // ::SendMode expects a userrec* to send the numeric replies
- // back to, so we create it a fake user that isnt in the user
- // hash and set its descriptor to FD_MAGIC_NUMBER so the data
- // falls into the abyss :p
- userrec* temp = new userrec;
- temp->fd = FD_MAGIC_NUMBER;
- temp->server = "";
- Srv->SendMode(setban,3,temp);
- delete temp;
+ setban[2] = i->mask.c_str();
+
+ ServerInstance->PI->SendModeStr(i->channel, std::string("-b ") + setban[2]);
+ ServerInstance->SendMode(setban,3, ServerInstance->FakeClient);
+
+ CUList empty;
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str());
+ if (ServerInstance->Config->AllowHalfop)
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str());
+ }
+ else
+ {
+ /* Where the hell did our channel go?! */
+ TimedBanList.erase(i);
}
// we used to delete the item here, but we dont need to as the servermode above does it for us,
break;
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_VENDOR);
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
};
+MODULE_INIT(ModuleTimedBans)
-class ModuleTimedBansFactory : public ModuleFactory
-{
- public:
- ModuleTimedBansFactory()
- {
- }
-
- ~ModuleTimedBansFactory()
- {
- }
-
- virtual Module * CreateModule(Server* Me)
- {
- return new ModuleTimedBans(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleTimedBansFactory;
-}
projects / user / henk / code / inspircd.git / blobdiff